diff --git a/README.rst b/README.rst
index d9e78b2..e3cc5d4 100644
--- a/README.rst
+++ b/README.rst
@@ -37,7 +37,7 @@ Just make sure that:
 
 - You eventually update ``wiki`` submodule with a thorough section.
 
-Contributed widgets have to be put in ``lain/widgets/contrib``.
+Contributed widgets have to be put in ``widget/contrib``.
 
 Screenshots
 -----------
diff --git a/init.lua b/init.lua
index 5640861..46ab825 100644
--- a/init.lua
+++ b/init.lua
@@ -10,7 +10,7 @@
 --]]
 
 return {
-    layout  = require("lain.layout"),
-    util    = require("lain.util"),
-    widgets = require("lain.widgets")
+    layout = require("lain.layout"),
+    util   = require("lain.util"),
+    widget = require("lain.widget")
 }
diff --git a/widgets/alsa.lua b/widget/alsa.lua
similarity index 98%
rename from widgets/alsa.lua
rename to widget/alsa.lua
index f73194b..9406e0d 100644
--- a/widgets/alsa.lua
+++ b/widget/alsa.lua
@@ -15,7 +15,7 @@ local string       = { match  = string.match,
 local setmetatable = setmetatable
 
 -- ALSA volume
--- lain.widgets.alsa
+-- lain.widget.alsa
 
 local function worker(args)
     local alsa     = { widget = wibox.widget.textbox() }
diff --git a/widgets/alsabar.lua b/widget/alsabar.lua
similarity index 99%
rename from widgets/alsabar.lua
rename to widget/alsabar.lua
index 628e838..4386d20 100644
--- a/widgets/alsabar.lua
+++ b/widget/alsabar.lua
@@ -20,7 +20,7 @@ local tonumber     = tonumber
 local setmetatable = setmetatable
 
 -- ALSA volume bar
--- lain.widgets.alsabar
+-- lain.widget.alsabar
 local alsabar = {
     colors = {
         background = "#000000",
diff --git a/widgets/bat.lua b/widget/bat.lua
similarity index 99%
rename from widgets/bat.lua
rename to widget/bat.lua
index e479fd9..85d574e 100644
--- a/widgets/bat.lua
+++ b/widget/bat.lua
@@ -22,7 +22,7 @@ local tonumber     = tonumber
 local setmetatable = setmetatable
 
 -- Battery infos
--- lain.widgets.bat
+-- lain.widget.bat
 
 local function worker(args)
     local bat       = { widget = wibox.widget.textbox() }
diff --git a/widgets/calendar.lua b/widget/calendar.lua
similarity index 99%
rename from widgets/calendar.lua
rename to widget/calendar.lua
index a02b13d..4a3d207 100644
--- a/widgets/calendar.lua
+++ b/widget/calendar.lua
@@ -18,7 +18,7 @@ local tonumber     = tonumber
 local setmetatable = setmetatable
 
 -- Calendar notification
--- lain.widgets.calendar
+-- lain.widget.calendar
 local calendar = { offset = 0 }
 
 function calendar.hide()
diff --git a/widgets/contrib/gpmdp.lua b/widget/contrib/gpmdp.lua
similarity index 100%
rename from widgets/contrib/gpmdp.lua
rename to widget/contrib/gpmdp.lua
diff --git a/widgets/contrib/init.lua b/widget/contrib/init.lua
similarity index 92%
rename from widgets/contrib/init.lua
rename to widget/contrib/init.lua
index eb5d610..9d1e703 100644
--- a/widgets/contrib/init.lua
+++ b/widget/contrib/init.lua
@@ -14,6 +14,6 @@
 local wrequire     = require("lain.helpers").wrequire
 local setmetatable = setmetatable
 
-local widgets = { _NAME = "lain.widgets.contrib" }
+local widgets = { _NAME = "lain.widget.contrib" }
 
 return setmetatable(widgets, { __index = wrequire })
diff --git a/widgets/contrib/kbdlayout.lua b/widget/contrib/kbdlayout.lua
similarity index 98%
rename from widgets/contrib/kbdlayout.lua
rename to widget/contrib/kbdlayout.lua
index 08e7bd0..176f73a 100644
--- a/widgets/contrib/kbdlayout.lua
+++ b/widget/contrib/kbdlayout.lua
@@ -15,7 +15,7 @@ local execute      = os.execute
 local setmetatable = setmetatable
 
 -- Keyboard layout switcher
--- lain.widgets.contrib.kblayout
+-- lain.widget.contrib.kblayout
 local kbdlayout = {}
 
 local function worker(args)
diff --git a/widgets/contrib/moc.lua b/widget/contrib/moc.lua
similarity index 99%
rename from widgets/contrib/moc.lua
rename to widget/contrib/moc.lua
index 6fe96a1..fda50fc 100644
--- a/widgets/contrib/moc.lua
+++ b/widget/contrib/moc.lua
@@ -18,7 +18,7 @@ local string       = { format = string.format,
 local setmetatable = setmetatable
 
 -- MOC audio player
--- lain.widgets.contrib.moc
+-- lain.widget.contrib.moc
 local moc = {}
 
 local function worker(args)
diff --git a/widgets/contrib/redshift.lua b/widget/contrib/redshift.lua
similarity index 98%
rename from widgets/contrib/redshift.lua
rename to widget/contrib/redshift.lua
index 73cc100..0babb3a 100644
--- a/widgets/contrib/redshift.lua
+++ b/widget/contrib/redshift.lua
@@ -12,7 +12,7 @@ local execute = os.execute
 local type    = type
 
 -- Redshift
--- lain.widgets.contrib.redshift
+-- lain.widget.contrib.redshift
 local redshift = { active = false, pid = nil }
 
 function redshift:start()
diff --git a/widgets/contrib/task.lua b/widget/contrib/task.lua
similarity index 98%
rename from widgets/contrib/task.lua
rename to widget/contrib/task.lua
index 4a9b5b6..ba79553 100644
--- a/widgets/contrib/task.lua
+++ b/widget/contrib/task.lua
@@ -13,7 +13,7 @@ local naughty = require("naughty")
 local string  = { format = string.format, gsub = string.gsub }
 
 -- Taskwarrior notification
--- lain.widgets.contrib.task
+-- lain.widget.contrib.task
 local task = {}
 
 function task.hide()
diff --git a/widgets/contrib/tpbat/init.lua b/widget/contrib/tpbat/init.lua
similarity index 98%
rename from widgets/contrib/tpbat/init.lua
rename to widget/contrib/tpbat/init.lua
index 20a10f4..49cc01a 100644
--- a/widgets/contrib/tpbat/init.lua
+++ b/widget/contrib/tpbat/init.lua
@@ -3,7 +3,7 @@
                                                                
      tpbat.lua                                                 
      Battery status widget for ThinkPad laptops that use SMAPI 
-     lain.widgets.contrib.tpbat                                
+     lain.widget.contrib.tpbat                                
                                                                
      More on tp_smapi: http://www.thinkwiki.org/wiki/Tp_smapi  
                                                                
@@ -27,7 +27,7 @@ package.path       = debug.getinfo(1,"S").source:match[[^@?(.*[\/])[^\/]-$]] ..
 local smapi        = require("smapi")
 
 -- ThinkPad SMAPI-enabled battery info widget
--- lain.widgets.contrib.tpbat
+-- lain.widget.contrib.tpbat
 local tpbat = {}
 
 function tpbat.hide()
diff --git a/widgets/contrib/tpbat/smapi.lua b/widget/contrib/tpbat/smapi.lua
similarity index 100%
rename from widgets/contrib/tpbat/smapi.lua
rename to widget/contrib/tpbat/smapi.lua
diff --git a/widgets/cpu.lua b/widget/cpu.lua
similarity index 99%
rename from widgets/cpu.lua
rename to widget/cpu.lua
index 076b692..3e3b3a3 100644
--- a/widgets/cpu.lua
+++ b/widget/cpu.lua
@@ -16,7 +16,7 @@ local tostring     = tostring
 local setmetatable = setmetatable
 
 -- CPU usage
--- lain.widgets.cpu
+-- lain.widget.cpu
 local cpu = { core = {} }
 
 local function worker(args)
diff --git a/widgets/fs.lua b/widget/fs.lua
similarity index 99%
rename from widgets/fs.lua
rename to widget/fs.lua
index ec87191..652fa8a 100644
--- a/widgets/fs.lua
+++ b/widget/fs.lua
@@ -19,7 +19,7 @@ local tonumber     = tonumber
 local setmetatable = setmetatable
 
 -- File system disk space usage
--- lain.widgets.fs
+-- lain.widget.fs
 local fs = { unit  = { ["mb"] = 1024, ["gb"] = 1024^2 } }
 
 function fs.hide()
diff --git a/widgets/imap.lua b/widget/imap.lua
similarity index 99%
rename from widgets/imap.lua
rename to widget/imap.lua
index 95d35fd..1049d03 100644
--- a/widgets/imap.lua
+++ b/widget/imap.lua
@@ -16,7 +16,7 @@ local tonumber     = tonumber
 local setmetatable = setmetatable
 
 -- Mail IMAP check
--- lain.widgets.imap
+-- lain.widget.imap
 
 local function worker(args)
     local imap      = { widget = wibox.widget.textbox() }
diff --git a/widgets/init.lua b/widget/init.lua
similarity index 94%
rename from widgets/init.lua
rename to widget/init.lua
index 0e863ba..9619d79 100644
--- a/widgets/init.lua
+++ b/widget/init.lua
@@ -15,6 +15,6 @@
 local wrequire     = require("lain.helpers").wrequire
 local setmetatable = setmetatable
 
-local widgets = { _NAME = "lain.widgets" }
+local widgets = { _NAME = "lain.widget" }
 
 return setmetatable(widgets, { __index = wrequire })
diff --git a/widgets/mem.lua b/widget/mem.lua
similarity index 98%
rename from widgets/mem.lua
rename to widget/mem.lua
index 7b717ef..74ebad0 100644
--- a/widgets/mem.lua
+++ b/widget/mem.lua
@@ -15,7 +15,7 @@ local floor        = math.floor
 local setmetatable = setmetatable
 
 -- Memory usage (ignoring caches)
--- lain.widgets.mem
+-- lain.widget.mem
 local mem = {}
 
 local function worker(args)
diff --git a/widgets/mpd.lua b/widget/mpd.lua
similarity index 99%
rename from widgets/mpd.lua
rename to widget/mpd.lua
index ddedf24..b5281b0 100644
--- a/widgets/mpd.lua
+++ b/widget/mpd.lua
@@ -20,7 +20,7 @@ local string       = { format = string.format,
 local setmetatable = setmetatable
 
 -- MPD infos
--- lain.widgets.mpd
+-- lain.widget.mpd
 local mpd = {}
 
 local function worker(args)
diff --git a/widgets/net.lua b/widget/net.lua
similarity index 99%
rename from widgets/net.lua
rename to widget/net.lua
index 223f3af..c6ebaca 100644
--- a/widgets/net.lua
+++ b/widget/net.lua
@@ -15,7 +15,7 @@ local string       = { format = string.format,
 local setmetatable = setmetatable
 
 -- Network infos
--- lain.widgets.net
+-- lain.widget.net
 
 local function worker(args)
     local net = { widget = wibox.widget.textbox() }
diff --git a/widgets/pulseaudio.lua b/widget/pulseaudio.lua
similarity index 98%
rename from widgets/pulseaudio.lua
rename to widget/pulseaudio.lua
index 05ef337..44694d1 100644
--- a/widgets/pulseaudio.lua
+++ b/widget/pulseaudio.lua
@@ -15,7 +15,7 @@ local string       = { gmatch = string.gmatch,
 local setmetatable = setmetatable
 
 -- PulseAudio volume
--- lain.widgets.pulseaudio
+-- lain.widget.pulseaudio
 
 local function worker(args)
     local pulseaudio = { widget = wibox.widget.textbox() }
diff --git a/widgets/pulsebar.lua b/widget/pulsebar.lua
similarity index 99%
rename from widgets/pulsebar.lua
rename to widget/pulsebar.lua
index c75ad4a..fede5ba 100644
--- a/widgets/pulsebar.lua
+++ b/widget/pulsebar.lua
@@ -21,7 +21,7 @@ local tonumber     = tonumber
 local setmetatable = setmetatable
 
 -- Pulseaudio volume bar
--- lain.widgets.pulsebar
+-- lain.widget.pulsebar
 local pulsebar = {
     colors = {
         background = "#000000",
diff --git a/widgets/sysload.lua b/widget/sysload.lua
similarity index 97%
rename from widgets/sysload.lua
rename to widget/sysload.lua
index df9dbea..ada349c 100644
--- a/widgets/sysload.lua
+++ b/widget/sysload.lua
@@ -14,7 +14,7 @@ local string       = { match  = string.match }
 local setmetatable = setmetatable
 
 -- System load
--- lain.widgets.sysload
+-- lain.widget.sysload
 local sysload = {}
 
 local function worker(args)
diff --git a/widgets/temp.lua b/widget/temp.lua
similarity index 98%
rename from widgets/temp.lua
rename to widget/temp.lua
index 1c7e86c..b662346 100644
--- a/widgets/temp.lua
+++ b/widget/temp.lua
@@ -13,7 +13,7 @@ local tonumber     = tonumber
 local setmetatable = setmetatable
 
 -- coretemp
--- lain.widgets.temp
+-- lain.widget.temp
 local temp = {}
 
 local function worker(args)
diff --git a/widgets/watch.lua b/widget/watch.lua
similarity index 98%
rename from widgets/watch.lua
rename to widget/watch.lua
index abca92b..55226b9 100644
--- a/widgets/watch.lua
+++ b/widget/watch.lua
@@ -11,7 +11,7 @@ local textbox      = require("wibox.widget.textbox")
 local setmetatable = setmetatable
 
 -- Template for asynchronous watcher widgets
--- lain.widgets.watch
+-- lain.widget.watch
 
 local function worker(args)
     local watch     = {}
diff --git a/widgets/weather.lua b/widget/weather.lua
similarity index 99%
rename from widgets/weather.lua
rename to widget/weather.lua
index 9e1b80e..1b2e80f 100644
--- a/widgets/weather.lua
+++ b/widget/weather.lua
@@ -22,7 +22,7 @@ local setmetatable = setmetatable
 
 -- OpenWeatherMap
 -- current weather and X-days forecast
--- lain.widgets.weather
+-- lain.widget.weather
 
 local function worker(args)
     local weather               = { widget = wibox.widget.textbox() }
diff --git a/wiki b/wiki
index 32904a7..d3b29e2 160000
--- a/wiki
+++ b/wiki
@@ -1 +1 @@
-Subproject commit 32904a7e2cc20b9aec497aa9a031324fc535b0f9
+Subproject commit d3b29e25c4d47a5988948d2f9432d9353c826c2a