diff --git a/plugins/freedesktop/freedesktop.lua b/plugins/freedesktop/freedesktop.lua
index 03fe439..62d4b7b 100644
--- a/plugins/freedesktop/freedesktop.lua
+++ b/plugins/freedesktop/freedesktop.lua
@@ -7,7 +7,7 @@
 local awful     = require("awful")
 local beautiful = require("beautiful")
 
-require('freedesktop')
+require('plugins.freedesktop')
 -- require("debian.menu")
 
 freedesktop.utils.terminal   = terminal -- defined in rc.lua, otherwise define it here (default: "xterm")
diff --git a/plugins/freedesktop/init.lua b/plugins/freedesktop/init.lua
index 955754e..2f44396 100644
--- a/plugins/freedesktop/init.lua
+++ b/plugins/freedesktop/init.lua
@@ -1,5 +1,5 @@
-require("freedesktop.utils")
-require("freedesktop.menu")
-require("freedesktop.desktop")
+require("plugins.freedesktop.utils")
+require("plugins.freedesktop.menu")
+require("plugins.freedesktop.desktop")
 
 module("freedesktop")
diff --git a/rc.lua.blackburn b/rc.lua.blackburn
index 699a54f..651f013 100644
--- a/rc.lua.blackburn
+++ b/rc.lua.blackburn
@@ -1,8 +1,8 @@
 --[[
-                                     
-     Blackburn Awesome WM config 2.0 
-     github.com/copycat-killer       
-                                     
+
+     Blackburn Awesome WM config 2.0
+     github.com/copycat-killer
+
 --]]
 
 -- {{{ Required libraries
@@ -13,7 +13,7 @@ require("awful.autofocus")
 local wibox     = require("wibox")
 local beautiful = require("beautiful")
 local naughty   = require("naughty")
-local drop      = require("scratchdrop")
+local drop      = require("plugins.scratchdrop")
 local lain      = require("lain")
 -- }}}
 
@@ -101,7 +101,7 @@ end
 -- }}}
 
 -- {{{ Menu
-require("freedesktop/freedesktop")
+require("plugins.freedesktop/freedesktop")
 -- }}}
 
 -- {{{ Wibox
diff --git a/rc.lua.copland b/rc.lua.copland
index dcf3db6..38928b0 100644
--- a/rc.lua.copland
+++ b/rc.lua.copland
@@ -1,8 +1,8 @@
 --[[
-                               
-     Copland Awesome WM config 
-     github.com/copycat-killer 
-                               
+
+     Copland Awesome WM config
+     github.com/copycat-killer
+
 --]]
 
 -- {{{ Required libraries
@@ -13,9 +13,9 @@ require("awful.autofocus")
 local wibox     = require("wibox")
 local beautiful = require("beautiful")
 local naughty   = require("naughty")
-local drop      = require("scratchdrop")
+local drop      = require("plugins.scratchdrop")
 local lain      = require("lain")
-local eminent   = require("eminent")
+local eminent   = require("plugins.eminent")
 -- }}}
 
 -- {{{ Error handling
@@ -112,7 +112,7 @@ end
 -- }}}
 
 -- {{{ Menu
-require("freedesktop/freedesktop")
+require("plugins.freedesktop/freedesktop")
 -- }}}
 
 -- {{{ Wibox
@@ -244,7 +244,7 @@ settings = function()
         volicon:set_image(beautiful.vol)
     end
 end,
-colors = 
+colors =
 {
     background = beautiful.bg_normal,
     mute = "#EB8F8F",
diff --git a/rc.lua.dremora b/rc.lua.dremora
index ff7daed..99e9d6e 100644
--- a/rc.lua.dremora
+++ b/rc.lua.dremora
@@ -1,8 +1,8 @@
 --[[
-                                   
-     Dremora Awesome WM config 2.0 
-     github.com/copycat-killer     
-                                   
+
+     Dremora Awesome WM config 2.0
+     github.com/copycat-killer
+
 --]]
 
 -- {{{ Required libraries
@@ -13,7 +13,7 @@ require("awful.autofocus")
 local wibox     = require("wibox")
 local beautiful = require("beautiful")
 local naughty   = require("naughty")
-local drop      = require("scratchdrop")
+local drop      = require("plugins.scratchdrop")
 local lain      = require("lain")
 -- }}}
 
@@ -101,7 +101,7 @@ end
 -- }}}
 
 -- {{{ Menu
-require("freedesktop/freedesktop")
+require("plugins.freedesktop/freedesktop")
 -- }}}
 
 -- {{{ Wibox
diff --git a/rc.lua.holo b/rc.lua.holo
index 8594453..1b3a5a0 100644
--- a/rc.lua.holo
+++ b/rc.lua.holo
@@ -1,8 +1,8 @@
 --[[
-                                
-     Holo Awesome WM config 2.0 
-     github.com/copycat-killer  
-                                
+
+     Holo Awesome WM config 2.0
+     github.com/copycat-killer
+
 --]]
 
 -- {{{ Required libraries
@@ -13,7 +13,7 @@ require("awful.autofocus")
 local wibox     = require("wibox")
 local beautiful = require("beautiful")
 local naughty   = require("naughty")
-local drop      = require("scratchdrop")
+local drop      = require("plugins.scratchdrop")
 local lain      = require("lain")
 -- }}}
 
@@ -102,7 +102,7 @@ end
 -- }}}
 
 -- {{{ Menu
-require("freedesktop/freedesktop")
+require("plugins.freedesktop/freedesktop")
 -- }}}
 
 -- {{{ Wibox
@@ -175,7 +175,7 @@ mpdwidget = lain.widgets.mpd({
             mpd_now.artist = mpd_now.artist:upper():gsub("&.-;", string.lower)
             mpd_now.title = mpd_now.title:upper():gsub("&.-;", string.lower)
             widget:set_markup(markup.font("Tamsyn 4", " ")
-                              .. markup.font("Tamsyn 8", 
+                              .. markup.font("Tamsyn 8",
                               mpd_now.artist
                               .. " - " ..
                               mpd_now.title
diff --git a/rc.lua.multicolor b/rc.lua.multicolor
index 95c1ca1..19a2a42 100644
--- a/rc.lua.multicolor
+++ b/rc.lua.multicolor
@@ -1,8 +1,8 @@
 --[[
-                                      
-     Multicolor Awesome WM config 2.0 
-     github.com/copycat-killer        
-                                      
+
+     Multicolor Awesome WM config 2.0
+     github.com/copycat-killer
+
 --]]
 
 -- {{{ Required libraries
@@ -13,7 +13,7 @@ require("awful.autofocus")
 local wibox     = require("wibox")
 local beautiful = require("beautiful")
 local naughty   = require("naughty")
-local drop      = require("scratchdrop")
+local drop      = require("plugins.scratchdrop")
 local lain      = require("lain")
 -- }}}
 
@@ -107,7 +107,7 @@ end
 -- }}}
 
 -- {{{ Freedesktop Menu
-require("freedesktop/freedesktop")
+require("plugins.freedesktop/freedesktop")
 -- }}}
 
 -- {{{ Wibox
@@ -198,7 +198,7 @@ volumewidget = lain.widgets.alsa({
     end
 })
 
--- Net 
+-- Net
 netdownicon = wibox.widget.imagebox(beautiful.widget_netdown)
 --netdownicon.align = "middle"
 netdowninfo = wibox.widget.textbox()
@@ -301,11 +301,11 @@ mytasklist.buttons = awful.util.table.join(
                                           end))
 
 for s = 1, screen.count() do
-    
+
     -- Create a promptbox for each screen
     mypromptbox[s] = awful.widget.prompt()
 
-    
+
     -- We need one layoutbox per screen.
     mylayoutbox[s] = awful.widget.layoutbox(s)
     mylayoutbox[s]:buttons(awful.util.table.join(
@@ -321,9 +321,9 @@ for s = 1, screen.count() do
     mytasklist[s] = awful.widget.tasklist(s, awful.widget.tasklist.filter.currenttags, mytasklist.buttons)
 
     -- Create the upper wibox
-    mywibox[s] = awful.wibox({ position = "top", screen = s, height = 20 }) 
+    mywibox[s] = awful.wibox({ position = "top", screen = s, height = 20 })
     --border_width = 0, height =  20 })
-        
+
     -- Widgets that are aligned to the upper left
     local left_layout = wibox.layout.fixed.horizontal()
     left_layout:add(mytaglist[s])
@@ -362,20 +362,20 @@ for s = 1, screen.count() do
     layout:set_left(left_layout)
     --layout:set_middle(mytasklist[s])
     layout:set_right(right_layout)
-    
+
     mywibox[s]:set_widget(layout)
 
     -- Create the bottom wibox
     mybottomwibox[s] = awful.wibox({ position = "bottom", screen = s, border_width = 0, height = 20 })
     --mybottomwibox[s].visible = false
-            
+
     -- Widgets that are aligned to the bottom left
     bottom_left_layout = wibox.layout.fixed.horizontal()
-                        
+
     -- Widgets that are aligned to the bottom right
     bottom_right_layout = wibox.layout.fixed.horizontal()
     bottom_right_layout:add(mylayoutbox[s])
-                                            
+
     -- Now bring it all together (with the tasklist in the middle)
     bottom_layout = wibox.layout.align.horizontal()
     bottom_layout:set_left(bottom_left_layout)
@@ -698,7 +698,7 @@ for s = 1, screen.count() do screen[s]:connect_signal("arrange", function ()
                     c.border_width = 0
                 elseif awful.client.floating.get(c) or layout == "floating" then
                     c.border_width = beautiful.border_width
-                elseif #clients == 1 then 
+                elseif #clients == 1 then
                     clients[1].border_width = 0
                     if layout ~= "max" then
                         awful.client.moveresize(0, 0, 2, 0, clients[1])
diff --git a/rc.lua.powerarrow-darker b/rc.lua.powerarrow-darker
index c143005..21b747e 100644
--- a/rc.lua.powerarrow-darker
+++ b/rc.lua.powerarrow-darker
@@ -1,8 +1,8 @@
 --[[
-                                             
-     Powerarrow Darker Awesome WM config 2.0 
-     github.com/copycat-killer               
-                                             
+
+     Powerarrow Darker Awesome WM config 2.0
+     github.com/copycat-killer
+
 --]]
 
 -- {{{ Required libraries
@@ -13,7 +13,7 @@ require("awful.autofocus")
 local wibox     = require("wibox")
 local beautiful = require("beautiful")
 local naughty   = require("naughty")
-local drop      = require("scratchdrop")
+local drop      = require("plugins.scratchdrop")
 local lain      = require("lain")
 -- }}}
 
@@ -104,7 +104,7 @@ end
 -- }}}
 
 -- {{{ Menu
-require("freedesktop/freedesktop")
+require("plugins.freedesktop/freedesktop")
 -- }}}
 
 -- {{{ Wibox
diff --git a/rc.lua.rainbow b/rc.lua.rainbow
index 9f58f3a..09c3c4d 100644
--- a/rc.lua.rainbow
+++ b/rc.lua.rainbow
@@ -1,8 +1,8 @@
 --[[
 
-     Rainbow Awesome WM config 2.0 
-     github.com/copycat-killer     
-                                   
+     Rainbow Awesome WM config 2.0
+     github.com/copycat-killer
+
 --]]
 
 -- {{{ Required libraries
@@ -13,7 +13,7 @@ require("awful.autofocus")
 local wibox     = require("wibox")
 local beautiful = require("beautiful")
 local naughty   = require("naughty")
-local drop      = require("scratchdrop")
+local drop      = require("plugins.scratchdrop")
 local lain      = require("lain")
 -- }}}
 
@@ -108,7 +108,7 @@ end
 -- }}}
 
 -- {{{ Menu
-require("freedesktop/freedesktop")
+require("plugins.freedesktop/freedesktop")
 -- }}}
 
 -- {{{ Wibox
diff --git a/rc.lua.steamburn b/rc.lua.steamburn
index f116819..767f70a 100644
--- a/rc.lua.steamburn
+++ b/rc.lua.steamburn
@@ -1,8 +1,8 @@
 --[[
-                                     
-     Steamburn Awesome WM config 3.0 
-     github.com/copycat-killer       
-                                     
+
+     Steamburn Awesome WM config 3.0
+     github.com/copycat-killer
+
 --]]
 
 -- {{{ Required libraries
@@ -13,7 +13,7 @@ require("awful.autofocus")
 local wibox     = require("wibox")
 local beautiful = require("beautiful")
 local naughty   = require("naughty")
-local drop      = require("scratchdrop")
+local drop      = require("plugins.scratchdrop")
 local lain      = require("lain")
 -- }}}
 
@@ -106,7 +106,7 @@ end
 -- }}}
 
 -- {{{ Menu
-require("freedesktop/freedesktop")
+require("plugins.freedesktop/freedesktop")
 -- }}}
 
 -- {{{ Wibox