All sources moved inside src

62 files changed, 5 insertions, 3 deletions

diff --git a/app/Configuration.hs b/src/app/Configuration.hs
index db5c109..db5c109 100644
--- a/app/Configuration.hs
+++ b/src/app/Configuration.hs
diff --git a/app/Main.hs b/src/app/Main.hs
index c96c47e..c96c47e 100644
--- a/app/Main.hs
+++ b/src/app/Main.hs
diff --git a/src/Xmobar.hs b/src/lib/Xmobar.hs
index e4eb4b7..e4eb4b7 100644
--- a/src/Xmobar.hs
+++ b/src/lib/Xmobar.hs
diff --git a/src/Xmobar/Actions.hs b/src/lib/Xmobar/Actions.hs
index 7901845..7901845 100644
--- a/src/Xmobar/Actions.hs
+++ b/src/lib/Xmobar/Actions.hs
diff --git a/src/Xmobar/Bitmap.hs b/src/lib/Xmobar/Bitmap.hs
index 314ce02..314ce02 100644
--- a/src/Xmobar/Bitmap.hs
+++ b/src/lib/Xmobar/Bitmap.hs
diff --git a/src/Xmobar/ColorCache.hs b/src/lib/Xmobar/ColorCache.hs
index f17aa0d..f17aa0d 100644
--- a/src/Xmobar/ColorCache.hs
+++ b/src/lib/Xmobar/ColorCache.hs
diff --git a/src/Xmobar/Commands.hs b/src/lib/Xmobar/Commands.hs
index ececdd9..ececdd9 100644
--- a/src/Xmobar/Commands.hs
+++ b/src/lib/Xmobar/Commands.hs
diff --git a/src/Xmobar/Config.hs b/src/lib/Xmobar/Config.hs
index 21b29fa..21b29fa 100644
--- a/src/Xmobar/Config.hs
+++ b/src/lib/Xmobar/Config.hs
diff --git a/src/Xmobar/Environment.hs b/src/lib/Xmobar/Environment.hs
index 8a9223a..8a9223a 100644
--- a/src/Xmobar/Environment.hs
+++ b/src/lib/Xmobar/Environment.hs
diff --git a/src/Xmobar/IPC/DBus.hs b/src/lib/Xmobar/IPC/DBus.hs
index 894637b..894637b 100644
--- a/src/Xmobar/IPC/DBus.hs
+++ b/src/lib/Xmobar/IPC/DBus.hs
diff --git a/src/Xmobar/Localize.hsc b/src/lib/Xmobar/Localize.hsc
index 984aa2b..984aa2b 100644
--- a/src/Xmobar/Localize.hsc
+++ b/src/lib/Xmobar/Localize.hsc
diff --git a/src/Xmobar/MinXft.hsc b/src/lib/Xmobar/MinXft.hsc
index 0bf36c7..0bf36c7 100644
--- a/src/Xmobar/MinXft.hsc
+++ b/src/lib/Xmobar/MinXft.hsc
diff --git a/src/Xmobar/Parsers.hs b/src/lib/Xmobar/Parsers.hs
index 33afd09..33afd09 100644
--- a/src/Xmobar/Parsers.hs
+++ b/src/lib/Xmobar/Parsers.hs
diff --git a/src/Xmobar/Plugins.hs b/src/lib/Xmobar/Plugins.hs
index 75ee306..75ee306 100644
--- a/src/Xmobar/Plugins.hs
+++ b/src/lib/Xmobar/Plugins.hs
diff --git a/src/Xmobar/Plugins/BufferedPipeReader.hs b/src/lib/Xmobar/Plugins/BufferedPipeReader.hs
index d4d30a1..d4d30a1 100644
--- a/src/Xmobar/Plugins/BufferedPipeReader.hs
+++ b/src/lib/Xmobar/Plugins/BufferedPipeReader.hs
diff --git a/src/Xmobar/Plugins/CommandReader.hs b/src/lib/Xmobar/Plugins/CommandReader.hs
index 80b6299..80b6299 100644
--- a/src/Xmobar/Plugins/CommandReader.hs
+++ b/src/lib/Xmobar/Plugins/CommandReader.hs
diff --git a/src/Xmobar/Plugins/Date.hs b/src/lib/Xmobar/Plugins/Date.hs
index fdc6a56..fdc6a56 100644
--- a/src/Xmobar/Plugins/Date.hs
+++ b/src/lib/Xmobar/Plugins/Date.hs
diff --git a/src/Xmobar/Plugins/DateZone.hs b/src/lib/Xmobar/Plugins/DateZone.hs
index 753f530..753f530 100644
--- a/src/Xmobar/Plugins/DateZone.hs
+++ b/src/lib/Xmobar/Plugins/DateZone.hs
diff --git a/src/Xmobar/Plugins/EWMH.hs b/src/lib/Xmobar/Plugins/EWMH.hs
index 363ec90..363ec90 100644
--- a/src/Xmobar/Plugins/EWMH.hs
+++ b/src/lib/Xmobar/Plugins/EWMH.hs
diff --git a/src/Xmobar/Plugins/Kbd.hsc b/src/lib/Xmobar/Plugins/Kbd.hsc
index 372386e..372386e 100644
--- a/src/Xmobar/Plugins/Kbd.hsc
+++ b/src/lib/Xmobar/Plugins/Kbd.hsc
diff --git a/src/Xmobar/Plugins/Locks.hs b/src/lib/Xmobar/Plugins/Locks.hs
index 9a971e5..9a971e5 100644
--- a/src/Xmobar/Plugins/Locks.hs
+++ b/src/lib/Xmobar/Plugins/Locks.hs
diff --git a/src/Xmobar/Plugins/MBox.hs b/src/lib/Xmobar/Plugins/MBox.hs
index 2281629..2281629 100644
--- a/src/Xmobar/Plugins/MBox.hs
+++ b/src/lib/Xmobar/Plugins/MBox.hs
diff --git a/src/Xmobar/Plugins/Mail.hs b/src/lib/Xmobar/Plugins/Mail.hs
index c41b5b3..c41b5b3 100644
--- a/src/Xmobar/Plugins/Mail.hs
+++ b/src/lib/Xmobar/Plugins/Mail.hs
diff --git a/src/Xmobar/Plugins/MarqueePipeReader.hs b/src/lib/Xmobar/Plugins/MarqueePipeReader.hs
index ad6f27f..ad6f27f 100644
--- a/src/Xmobar/Plugins/MarqueePipeReader.hs
+++ b/src/lib/Xmobar/Plugins/MarqueePipeReader.hs
diff --git a/src/Xmobar/Plugins/Monitors.hs b/src/lib/Xmobar/Plugins/Monitors.hs
index 64d38f0..64d38f0 100644
--- a/src/Xmobar/Plugins/Monitors.hs
+++ b/src/lib/Xmobar/Plugins/Monitors.hs
diff --git a/src/Xmobar/Plugins/Monitors/Alsa.hs b/src/lib/Xmobar/Plugins/Monitors/Alsa.hs
index 21a2786..21a2786 100644
--- a/src/Xmobar/Plugins/Monitors/Alsa.hs
+++ b/src/lib/Xmobar/Plugins/Monitors/Alsa.hs
diff --git a/src/Xmobar/Plugins/Monitors/Batt.hs b/src/lib/Xmobar/Plugins/Monitors/Batt.hs
index 80f4275..80f4275 100644
--- a/src/Xmobar/Plugins/Monitors/Batt.hs
+++ b/src/lib/Xmobar/Plugins/Monitors/Batt.hs
diff --git a/src/Xmobar/Plugins/Monitors/Bright.hs b/src/lib/Xmobar/Plugins/Monitors/Bright.hs
index fe72219..fe72219 100644
--- a/src/Xmobar/Plugins/Monitors/Bright.hs
+++ b/src/lib/Xmobar/Plugins/Monitors/Bright.hs
diff --git a/src/Xmobar/Plugins/Monitors/CatInt.hs b/src/lib/Xmobar/Plugins/Monitors/CatInt.hs
index 781eded..781eded 100644
--- a/src/Xmobar/Plugins/Monitors/CatInt.hs
+++ b/src/lib/Xmobar/Plugins/Monitors/CatInt.hs
diff --git a/src/Xmobar/Plugins/Monitors/Common.hs b/src/lib/Xmobar/Plugins/Monitors/Common.hs
index 272690b..272690b 100644
--- a/src/Xmobar/Plugins/Monitors/Common.hs
+++ b/src/lib/Xmobar/Plugins/Monitors/Common.hs
diff --git a/src/Xmobar/Plugins/Monitors/CoreCommon.hs b/src/lib/Xmobar/Plugins/Monitors/CoreCommon.hs
index a84198e..a84198e 100644
--- a/src/Xmobar/Plugins/Monitors/CoreCommon.hs
+++ b/src/lib/Xmobar/Plugins/Monitors/CoreCommon.hs
diff --git a/src/Xmobar/Plugins/Monitors/CoreTemp.hs b/src/lib/Xmobar/Plugins/Monitors/CoreTemp.hs
index 48fe428..48fe428 100644
--- a/src/Xmobar/Plugins/Monitors/CoreTemp.hs
+++ b/src/lib/Xmobar/Plugins/Monitors/CoreTemp.hs
diff --git a/src/Xmobar/Plugins/Monitors/Cpu.hs b/src/lib/Xmobar/Plugins/Monitors/Cpu.hs
index 6befe7d..6befe7d 100644
--- a/src/Xmobar/Plugins/Monitors/Cpu.hs
+++ b/src/lib/Xmobar/Plugins/Monitors/Cpu.hs
diff --git a/src/Xmobar/Plugins/Monitors/CpuFreq.hs b/src/lib/Xmobar/Plugins/Monitors/CpuFreq.hs
index 1afedfa..1afedfa 100644
--- a/src/Xmobar/Plugins/Monitors/CpuFreq.hs
+++ b/src/lib/Xmobar/Plugins/Monitors/CpuFreq.hs
diff --git a/src/Xmobar/Plugins/Monitors/Disk.hs b/src/lib/Xmobar/Plugins/Monitors/Disk.hs
index aedad75..aedad75 100644
--- a/src/Xmobar/Plugins/Monitors/Disk.hs
+++ b/src/lib/Xmobar/Plugins/Monitors/Disk.hs
diff --git a/src/Xmobar/Plugins/Monitors/MPD.hs b/src/lib/Xmobar/Plugins/Monitors/MPD.hs
index 9525254..9525254 100644
--- a/src/Xmobar/Plugins/Monitors/MPD.hs
+++ b/src/lib/Xmobar/Plugins/Monitors/MPD.hs
diff --git a/src/Xmobar/Plugins/Monitors/Mem.hs b/src/lib/Xmobar/Plugins/Monitors/Mem.hs
index d69921b..d69921b 100644
--- a/src/Xmobar/Plugins/Monitors/Mem.hs
+++ b/src/lib/Xmobar/Plugins/Monitors/Mem.hs
diff --git a/src/Xmobar/Plugins/Monitors/Mpris.hs b/src/lib/Xmobar/Plugins/Monitors/Mpris.hs
index 3556649..3556649 100644
--- a/src/Xmobar/Plugins/Monitors/Mpris.hs
+++ b/src/lib/Xmobar/Plugins/Monitors/Mpris.hs
diff --git a/src/Xmobar/Plugins/Monitors/MultiCpu.hs b/src/lib/Xmobar/Plugins/Monitors/MultiCpu.hs
index 3db3b5f..3db3b5f 100644
--- a/src/Xmobar/Plugins/Monitors/MultiCpu.hs
+++ b/src/lib/Xmobar/Plugins/Monitors/MultiCpu.hs
diff --git a/src/Xmobar/Plugins/Monitors/Net.hs b/src/lib/Xmobar/Plugins/Monitors/Net.hs
index 81a5f6b..81a5f6b 100644
--- a/src/Xmobar/Plugins/Monitors/Net.hs
+++ b/src/lib/Xmobar/Plugins/Monitors/Net.hs
diff --git a/src/Xmobar/Plugins/Monitors/Swap.hs b/src/lib/Xmobar/Plugins/Monitors/Swap.hs
index fcaab84..fcaab84 100644
--- a/src/Xmobar/Plugins/Monitors/Swap.hs
+++ b/src/lib/Xmobar/Plugins/Monitors/Swap.hs
diff --git a/src/Xmobar/Plugins/Monitors/Thermal.hs b/src/lib/Xmobar/Plugins/Monitors/Thermal.hs
index 320ae17..320ae17 100644
--- a/src/Xmobar/Plugins/Monitors/Thermal.hs
+++ b/src/lib/Xmobar/Plugins/Monitors/Thermal.hs
diff --git a/src/Xmobar/Plugins/Monitors/ThermalZone.hs b/src/lib/Xmobar/Plugins/Monitors/ThermalZone.hs
index bc46b59..bc46b59 100644
--- a/src/Xmobar/Plugins/Monitors/ThermalZone.hs
+++ b/src/lib/Xmobar/Plugins/Monitors/ThermalZone.hs
diff --git a/src/Xmobar/Plugins/Monitors/Top.hs b/src/lib/Xmobar/Plugins/Monitors/Top.hs
index d6df249..d6df249 100644
--- a/src/Xmobar/Plugins/Monitors/Top.hs
+++ b/src/lib/Xmobar/Plugins/Monitors/Top.hs
diff --git a/src/Xmobar/Plugins/Monitors/UVMeter.hs b/src/lib/Xmobar/Plugins/Monitors/UVMeter.hs
index 079177f..079177f 100644
--- a/src/Xmobar/Plugins/Monitors/UVMeter.hs
+++ b/src/lib/Xmobar/Plugins/Monitors/UVMeter.hs
diff --git a/src/Xmobar/Plugins/Monitors/Uptime.hs b/src/lib/Xmobar/Plugins/Monitors/Uptime.hs
index 235fc85..235fc85 100644
--- a/src/Xmobar/Plugins/Monitors/Uptime.hs
+++ b/src/lib/Xmobar/Plugins/Monitors/Uptime.hs
diff --git a/src/Xmobar/Plugins/Monitors/Volume.hs b/src/lib/Xmobar/Plugins/Monitors/Volume.hs
index 1d3281c..1d3281c 100644
--- a/src/Xmobar/Plugins/Monitors/Volume.hs
+++ b/src/lib/Xmobar/Plugins/Monitors/Volume.hs
diff --git a/src/Xmobar/Plugins/Monitors/Weather.hs b/src/lib/Xmobar/Plugins/Monitors/Weather.hs
index cb5bf07..cb5bf07 100644
--- a/src/Xmobar/Plugins/Monitors/Weather.hs
+++ b/src/lib/Xmobar/Plugins/Monitors/Weather.hs
diff --git a/src/Xmobar/Plugins/Monitors/Wireless.hs b/src/lib/Xmobar/Plugins/Monitors/Wireless.hs
index 545f6bc..545f6bc 100644
--- a/src/Xmobar/Plugins/Monitors/Wireless.hs
+++ b/src/lib/Xmobar/Plugins/Monitors/Wireless.hs
diff --git a/src/Xmobar/Plugins/PipeReader.hs b/src/lib/Xmobar/Plugins/PipeReader.hs
index 7166163..7166163 100644
--- a/src/Xmobar/Plugins/PipeReader.hs
+++ b/src/lib/Xmobar/Plugins/PipeReader.hs
diff --git a/src/Xmobar/Plugins/StdinReader.hs b/src/lib/Xmobar/Plugins/StdinReader.hs
index 372e4f9..372e4f9 100644
--- a/src/Xmobar/Plugins/StdinReader.hs
+++ b/src/lib/Xmobar/Plugins/StdinReader.hs
diff --git a/src/Xmobar/Plugins/Utils.hs b/src/lib/Xmobar/Plugins/Utils.hs
index 6546c15..6546c15 100644
--- a/src/Xmobar/Plugins/Utils.hs
+++ b/src/lib/Xmobar/Plugins/Utils.hs
diff --git a/src/Xmobar/Plugins/XMonadLog.hs b/src/lib/Xmobar/Plugins/XMonadLog.hs
index 6bbba59..6bbba59 100644
--- a/src/Xmobar/Plugins/XMonadLog.hs
+++ b/src/lib/Xmobar/Plugins/XMonadLog.hs
diff --git a/src/Xmobar/Runnable.hs b/src/lib/Xmobar/Runnable.hs
index 164f661..164f661 100644
--- a/src/Xmobar/Runnable.hs
+++ b/src/lib/Xmobar/Runnable.hs
diff --git a/src/Xmobar/Runnable.hs-boot b/src/lib/Xmobar/Runnable.hs-boot
index 0f67322..0f67322 100644
--- a/src/Xmobar/Runnable.hs-boot
+++ b/src/lib/Xmobar/Runnable.hs-boot
diff --git a/src/Xmobar/Signal.hs b/src/lib/Xmobar/Signal.hs
index bdc4be1..bdc4be1 100644
--- a/src/Xmobar/Signal.hs
+++ b/src/lib/Xmobar/Signal.hs
diff --git a/src/Xmobar/StatFS.hsc b/src/lib/Xmobar/StatFS.hsc
index 25de0df..25de0df 100644
--- a/src/Xmobar/StatFS.hsc
+++ b/src/lib/Xmobar/StatFS.hsc
diff --git a/src/Xmobar/Window.hs b/src/lib/Xmobar/Window.hs
index c8228de..c8228de 100644
--- a/src/Xmobar/Window.hs
+++ b/src/lib/Xmobar/Window.hs
diff --git a/src/Xmobar/XPMFile.hsc b/src/lib/Xmobar/XPMFile.hsc
index 03d534f..03d534f 100644
--- a/src/Xmobar/XPMFile.hsc
+++ b/src/lib/Xmobar/XPMFile.hsc
diff --git a/src/Xmobar/XUtil.hsc b/src/lib/Xmobar/XUtil.hsc
index 05e6fad..05e6fad 100644
--- a/src/Xmobar/XUtil.hsc
+++ b/src/lib/Xmobar/XUtil.hsc
diff --git a/stack.yaml b/stack.yaml
index a46d035..3fabc3f 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -5,3 +5,5 @@ extra-deps:
 - iwlib-0.1.0
 - parsec-numbers-0.1.0
 - alsa-mixer-0.2.0.3
+- libmpd-0.9.0.9
+ 
diff --git a/xmobar.cabal b/xmobar.cabal
index 89f7997..4a22a8b 100644
--- a/xmobar.cabal
+++ b/xmobar.cabal
@@ -92,7 +92,7 @@ flag with_conduit
   default: False
 
 library
-    hs-source-dirs:  src
+    hs-source-dirs:  src/lib
 
     exposed-modules: Xmobar,
                      Xmobar.Actions,
@@ -243,7 +243,7 @@ library
        cpp-options: -DUVMETER
 
 executable xmobar
-    hs-source-dirs:     app
+    hs-source-dirs:     src/app
     main-is:            Main.hs
     other-modules:      Paths_xmobar, Configuration
     build-depends:      base,
@@ -271,7 +271,7 @@ executable xmobar
 
 test-suite XmobarTest
   type:           exitcode-stdio-1.0
-  hs-source-dirs: src, test
+  hs-source-dirs: src/lib, test
   main-is:        Spec.hs
   build-depends: base,
                  containers,