diff --git a/core/core-documentation.el b/core/core-documentation.el
index e264a641b..b5ee897b0 100644
--- a/core/core-documentation.el
+++ b/core/core-documentation.el
@@ -17,8 +17,10 @@
 (defvar spacemacs--category-names
   '(("config-files" . "Configuration files")
     ("email" . "E-mail")
-    ("irc" . "IRC")
-    ("lang" . "Programming and markup languages"))
+    ("intl" . "International support")
+    ("lang" . "Programming and markup languages")
+    ("os" . "Operating systems")
+    ("spacemacs" . "Spacemacs distribution layers"))
   "Special names for categories. Used to generate the layers list.")
 
 (defun spacemacs//generate-layers-from-path (path level)
diff --git a/layers/+irc/erc/README.org b/layers/+chat/erc/README.org
similarity index 100%
rename from layers/+irc/erc/README.org
rename to layers/+chat/erc/README.org
diff --git a/layers/+irc/erc/config.el b/layers/+chat/erc/config.el
similarity index 100%
rename from layers/+irc/erc/config.el
rename to layers/+chat/erc/config.el
diff --git a/layers/+irc/erc/local/erc-sasl/erc-sasl.el b/layers/+chat/erc/local/erc-sasl/erc-sasl.el
similarity index 100%
rename from layers/+irc/erc/local/erc-sasl/erc-sasl.el
rename to layers/+chat/erc/local/erc-sasl/erc-sasl.el
diff --git a/layers/+irc/erc/local/erc-tex/erc-tex.el b/layers/+chat/erc/local/erc-tex/erc-tex.el
similarity index 100%
rename from layers/+irc/erc/local/erc-tex/erc-tex.el
rename to layers/+chat/erc/local/erc-tex/erc-tex.el
diff --git a/layers/+irc/erc/local/erc-yank/README.md b/layers/+chat/erc/local/erc-yank/README.md
similarity index 100%
rename from layers/+irc/erc/local/erc-yank/README.md
rename to layers/+chat/erc/local/erc-yank/README.md
diff --git a/layers/+irc/erc/local/erc-yank/erc-yank.el b/layers/+chat/erc/local/erc-yank/erc-yank.el
similarity index 100%
rename from layers/+irc/erc/local/erc-yank/erc-yank.el
rename to layers/+chat/erc/local/erc-yank/erc-yank.el
diff --git a/layers/+irc/erc/packages.el b/layers/+chat/erc/packages.el
similarity index 100%
rename from layers/+irc/erc/packages.el
rename to layers/+chat/erc/packages.el
diff --git a/layers/jabber/README.org b/layers/+chat/jabber/README.org
similarity index 100%
rename from layers/jabber/README.org
rename to layers/+chat/jabber/README.org
diff --git a/layers/jabber/img/attribution.md b/layers/+chat/jabber/img/attribution.md
similarity index 100%
rename from layers/jabber/img/attribution.md
rename to layers/+chat/jabber/img/attribution.md
diff --git a/layers/jabber/img/jabber-logo.gif b/layers/+chat/jabber/img/jabber-logo.gif
similarity index 100%
rename from layers/jabber/img/jabber-logo.gif
rename to layers/+chat/jabber/img/jabber-logo.gif
diff --git a/layers/jabber/packages.el b/layers/+chat/jabber/packages.el
similarity index 100%
rename from layers/jabber/packages.el
rename to layers/+chat/jabber/packages.el
diff --git a/layers/+irc/rcirc/README.org b/layers/+chat/rcirc/README.org
similarity index 100%
rename from layers/+irc/rcirc/README.org
rename to layers/+chat/rcirc/README.org
diff --git a/layers/+irc/rcirc/config.el b/layers/+chat/rcirc/config.el
similarity index 100%
rename from layers/+irc/rcirc/config.el
rename to layers/+chat/rcirc/config.el
diff --git a/layers/+irc/rcirc/funcs.el b/layers/+chat/rcirc/funcs.el
similarity index 100%
rename from layers/+irc/rcirc/funcs.el
rename to layers/+chat/rcirc/funcs.el
diff --git a/layers/+irc/rcirc/img/irc.png b/layers/+chat/rcirc/img/irc.png
similarity index 100%
rename from layers/+irc/rcirc/img/irc.png
rename to layers/+chat/rcirc/img/irc.png
diff --git a/layers/+irc/rcirc/local/helm-rcirc/README.md b/layers/+chat/rcirc/local/helm-rcirc/README.md
similarity index 100%
rename from layers/+irc/rcirc/local/helm-rcirc/README.md
rename to layers/+chat/rcirc/local/helm-rcirc/README.md
diff --git a/layers/+irc/rcirc/local/helm-rcirc/helm-rcirc.el b/layers/+chat/rcirc/local/helm-rcirc/helm-rcirc.el
similarity index 100%
rename from layers/+irc/rcirc/local/helm-rcirc/helm-rcirc.el
rename to layers/+chat/rcirc/local/helm-rcirc/helm-rcirc.el
diff --git a/layers/+irc/rcirc/local/rcirc-late-fix/rcirc-late-fix.el b/layers/+chat/rcirc/local/rcirc-late-fix/rcirc-late-fix.el
similarity index 100%
rename from layers/+irc/rcirc/local/rcirc-late-fix/rcirc-late-fix.el
rename to layers/+chat/rcirc/local/rcirc-late-fix/rcirc-late-fix.el
diff --git a/layers/+irc/rcirc/local/rcirc-reconnect/rcirc-reconnect.el b/layers/+chat/rcirc/local/rcirc-reconnect/rcirc-reconnect.el
similarity index 100%
rename from layers/+irc/rcirc/local/rcirc-reconnect/rcirc-reconnect.el
rename to layers/+chat/rcirc/local/rcirc-reconnect/rcirc-reconnect.el
diff --git a/layers/+irc/rcirc/packages.el b/layers/+chat/rcirc/packages.el
similarity index 100%
rename from layers/+irc/rcirc/packages.el
rename to layers/+chat/rcirc/packages.el
diff --git a/layers/spell-checking/README.org b/layers/+checkers/spell-checking/README.org
similarity index 100%
rename from layers/spell-checking/README.org
rename to layers/+checkers/spell-checking/README.org
diff --git a/layers/spell-checking/config.el b/layers/+checkers/spell-checking/config.el
similarity index 100%
rename from layers/spell-checking/config.el
rename to layers/+checkers/spell-checking/config.el
diff --git a/layers/spell-checking/funcs.el b/layers/+checkers/spell-checking/funcs.el
similarity index 100%
rename from layers/spell-checking/funcs.el
rename to layers/+checkers/spell-checking/funcs.el
diff --git a/layers/spell-checking/packages.el b/layers/+checkers/spell-checking/packages.el
similarity index 100%
rename from layers/spell-checking/packages.el
rename to layers/+checkers/spell-checking/packages.el
diff --git a/layers/syntax-checking/README.org b/layers/+checkers/syntax-checking/README.org
similarity index 100%
rename from layers/syntax-checking/README.org
rename to layers/+checkers/syntax-checking/README.org
diff --git a/layers/syntax-checking/config.el b/layers/+checkers/syntax-checking/config.el
similarity index 100%
rename from layers/syntax-checking/config.el
rename to layers/+checkers/syntax-checking/config.el
diff --git a/layers/syntax-checking/funcs.el b/layers/+checkers/syntax-checking/funcs.el
similarity index 100%
rename from layers/syntax-checking/funcs.el
rename to layers/+checkers/syntax-checking/funcs.el
diff --git a/layers/syntax-checking/img/flycheck.png b/layers/+checkers/syntax-checking/img/flycheck.png
similarity index 100%
rename from layers/syntax-checking/img/flycheck.png
rename to layers/+checkers/syntax-checking/img/flycheck.png
diff --git a/layers/syntax-checking/packages.el b/layers/+checkers/syntax-checking/packages.el
similarity index 100%
rename from layers/syntax-checking/packages.el
rename to layers/+checkers/syntax-checking/packages.el
diff --git a/layers/auto-completion/README.org b/layers/+completion/auto-completion/README.org
similarity index 100%
rename from layers/auto-completion/README.org
rename to layers/+completion/auto-completion/README.org
diff --git a/layers/auto-completion/config.el b/layers/+completion/auto-completion/config.el
similarity index 100%
rename from layers/auto-completion/config.el
rename to layers/+completion/auto-completion/config.el
diff --git a/layers/auto-completion/funcs.el b/layers/+completion/auto-completion/funcs.el
similarity index 100%
rename from layers/auto-completion/funcs.el
rename to layers/+completion/auto-completion/funcs.el
diff --git a/layers/auto-completion/packages.el b/layers/+completion/auto-completion/packages.el
similarity index 100%
rename from layers/auto-completion/packages.el
rename to layers/+completion/auto-completion/packages.el
diff --git a/layers/auto-completion/snippets/emacs-lisp-mode/.yas-parents b/layers/+completion/auto-completion/snippets/emacs-lisp-mode/.yas-parents
similarity index 100%
rename from layers/auto-completion/snippets/emacs-lisp-mode/.yas-parents
rename to layers/+completion/auto-completion/snippets/emacs-lisp-mode/.yas-parents
diff --git a/layers/auto-completion/snippets/emacs-lisp-mode/.yas-setup.el b/layers/+completion/auto-completion/snippets/emacs-lisp-mode/.yas-setup.el
similarity index 100%
rename from layers/auto-completion/snippets/emacs-lisp-mode/.yas-setup.el
rename to layers/+completion/auto-completion/snippets/emacs-lisp-mode/.yas-setup.el
diff --git a/layers/auto-completion/snippets/emacs-lisp-mode/micro-state b/layers/+completion/auto-completion/snippets/emacs-lisp-mode/micro-state
similarity index 100%
rename from layers/auto-completion/snippets/emacs-lisp-mode/micro-state
rename to layers/+completion/auto-completion/snippets/emacs-lisp-mode/micro-state
diff --git a/layers/auto-completion/snippets/emacs-lisp-mode/new-package b/layers/+completion/auto-completion/snippets/emacs-lisp-mode/new-package
similarity index 100%
rename from layers/auto-completion/snippets/emacs-lisp-mode/new-package
rename to layers/+completion/auto-completion/snippets/emacs-lisp-mode/new-package
diff --git a/layers/better-defaults/README.org b/layers/+emacs/better-defaults/README.org
similarity index 100%
rename from layers/better-defaults/README.org
rename to layers/+emacs/better-defaults/README.org
diff --git a/layers/better-defaults/funcs.el b/layers/+emacs/better-defaults/funcs.el
similarity index 100%
rename from layers/better-defaults/funcs.el
rename to layers/+emacs/better-defaults/funcs.el
diff --git a/layers/better-defaults/img/emacs.png b/layers/+emacs/better-defaults/img/emacs.png
similarity index 100%
rename from layers/better-defaults/img/emacs.png
rename to layers/+emacs/better-defaults/img/emacs.png
diff --git a/layers/better-defaults/keybindings.el b/layers/+emacs/better-defaults/keybindings.el
similarity index 100%
rename from layers/better-defaults/keybindings.el
rename to layers/+emacs/better-defaults/keybindings.el
diff --git a/layers/ibuffer/README.org b/layers/+emacs/ibuffer/README.org
similarity index 100%
rename from layers/ibuffer/README.org
rename to layers/+emacs/ibuffer/README.org
diff --git a/layers/ibuffer/config.el b/layers/+emacs/ibuffer/config.el
similarity index 100%
rename from layers/ibuffer/config.el
rename to layers/+emacs/ibuffer/config.el
diff --git a/layers/ibuffer/funcs.el b/layers/+emacs/ibuffer/funcs.el
similarity index 100%
rename from layers/ibuffer/funcs.el
rename to layers/+emacs/ibuffer/funcs.el
diff --git a/layers/ibuffer/packages.el b/layers/+emacs/ibuffer/packages.el
similarity index 100%
rename from layers/ibuffer/packages.el
rename to layers/+emacs/ibuffer/packages.el
diff --git a/layers/org/README.org b/layers/+emacs/org/README.org
similarity index 100%
rename from layers/org/README.org
rename to layers/+emacs/org/README.org
diff --git a/layers/org/config.el b/layers/+emacs/org/config.el
similarity index 100%
rename from layers/org/config.el
rename to layers/+emacs/org/config.el
diff --git a/layers/org/img/org.png b/layers/+emacs/org/img/org.png
similarity index 100%
rename from layers/org/img/org.png
rename to layers/+emacs/org/img/org.png
diff --git a/layers/org/local/evil-org/evil-org.el b/layers/+emacs/org/local/evil-org/evil-org.el
similarity index 100%
rename from layers/org/local/evil-org/evil-org.el
rename to layers/+emacs/org/local/evil-org/evil-org.el
diff --git a/layers/org/local/ox-gfm/ox-gfm.el b/layers/+emacs/org/local/ox-gfm/ox-gfm.el
similarity index 100%
rename from layers/org/local/ox-gfm/ox-gfm.el
rename to layers/+emacs/org/local/ox-gfm/ox-gfm.el
diff --git a/layers/org/org-async-init.el b/layers/+emacs/org/org-async-init.el
similarity index 100%
rename from layers/org/org-async-init.el
rename to layers/+emacs/org/org-async-init.el
diff --git a/layers/org/packages.el b/layers/+emacs/org/packages.el
similarity index 100%
rename from layers/org/packages.el
rename to layers/+emacs/org/packages.el
diff --git a/layers/semantic/README.org b/layers/+emacs/semantic/README.org
similarity index 100%
rename from layers/semantic/README.org
rename to layers/+emacs/semantic/README.org
diff --git a/layers/semantic/packages.el b/layers/+emacs/semantic/packages.el
similarity index 100%
rename from layers/semantic/packages.el
rename to layers/+emacs/semantic/packages.el
diff --git a/layers/smex/README.org b/layers/+emacs/smex/README.org
similarity index 100%
rename from layers/smex/README.org
rename to layers/+emacs/smex/README.org
diff --git a/layers/smex/img/smex.png b/layers/+emacs/smex/img/smex.png
similarity index 100%
rename from layers/smex/img/smex.png
rename to layers/+emacs/smex/img/smex.png
diff --git a/layers/smex/packages.el b/layers/+emacs/smex/packages.el
similarity index 100%
rename from layers/smex/packages.el
rename to layers/+emacs/smex/packages.el
diff --git a/layers/typography/README.org b/layers/+emacs/typography/README.org
similarity index 100%
rename from layers/typography/README.org
rename to layers/+emacs/typography/README.org
diff --git a/layers/typography/config.el b/layers/+emacs/typography/config.el
similarity index 100%
rename from layers/typography/config.el
rename to layers/+emacs/typography/config.el
diff --git a/layers/typography/packages.el b/layers/+emacs/typography/packages.el
similarity index 100%
rename from layers/typography/packages.el
rename to layers/+emacs/typography/packages.el
diff --git a/layers/chinese/README.org b/layers/+intl/chinese/README.org
similarity index 100%
rename from layers/chinese/README.org
rename to layers/+intl/chinese/README.org
diff --git a/layers/chinese/config.el b/layers/+intl/chinese/config.el
similarity index 100%
rename from layers/chinese/config.el
rename to layers/+intl/chinese/config.el
diff --git a/layers/chinese/img/China.png b/layers/+intl/chinese/img/China.png
similarity index 100%
rename from layers/chinese/img/China.png
rename to layers/+intl/chinese/img/China.png
diff --git a/layers/chinese/img/Chinese.png b/layers/+intl/chinese/img/Chinese.png
similarity index 100%
rename from layers/chinese/img/Chinese.png
rename to layers/+intl/chinese/img/Chinese.png
diff --git a/layers/chinese/packages.el b/layers/+intl/chinese/packages.el
similarity index 100%
rename from layers/chinese/packages.el
rename to layers/+intl/chinese/packages.el
diff --git a/layers/nixos/README.org b/layers/+os/nixos/README.org
similarity index 100%
rename from layers/nixos/README.org
rename to layers/+os/nixos/README.org
diff --git a/layers/nixos/config.el b/layers/+os/nixos/config.el
similarity index 100%
rename from layers/nixos/config.el
rename to layers/+os/nixos/config.el
diff --git a/layers/nixos/img/nixos.jpg b/layers/+os/nixos/img/nixos.jpg
similarity index 100%
rename from layers/nixos/img/nixos.jpg
rename to layers/+os/nixos/img/nixos.jpg
diff --git a/layers/nixos/packages.el b/layers/+os/nixos/packages.el
similarity index 100%
rename from layers/nixos/packages.el
rename to layers/+os/nixos/packages.el
diff --git a/layers/osx/README.org b/layers/+os/osx/README.org
similarity index 100%
rename from layers/osx/README.org
rename to layers/+os/osx/README.org
diff --git a/layers/osx/config.el b/layers/+os/osx/config.el
similarity index 100%
rename from layers/osx/config.el
rename to layers/+os/osx/config.el
diff --git a/layers/osx/img/apple.png b/layers/+os/osx/img/apple.png
similarity index 100%
rename from layers/osx/img/apple.png
rename to layers/+os/osx/img/apple.png
diff --git a/layers/osx/img/osx.png b/layers/+os/osx/img/osx.png
similarity index 100%
rename from layers/osx/img/osx.png
rename to layers/+os/osx/img/osx.png
diff --git a/layers/osx/keybindings.el b/layers/+os/osx/keybindings.el
similarity index 100%
rename from layers/osx/keybindings.el
rename to layers/+os/osx/keybindings.el
diff --git a/layers/osx/packages.el b/layers/+os/osx/packages.el
similarity index 100%
rename from layers/osx/packages.el
rename to layers/+os/osx/packages.el
diff --git a/layers/floobits/README.org b/layers/+pair-programming/floobits/README.org
similarity index 100%
rename from layers/floobits/README.org
rename to layers/+pair-programming/floobits/README.org
diff --git a/layers/floobits/img/floobits.png b/layers/+pair-programming/floobits/img/floobits.png
similarity index 100%
rename from layers/floobits/img/floobits.png
rename to layers/+pair-programming/floobits/img/floobits.png
diff --git a/layers/floobits/packages.el b/layers/+pair-programming/floobits/packages.el
similarity index 100%
rename from layers/floobits/packages.el
rename to layers/+pair-programming/floobits/packages.el
diff --git a/layers/cscope/README.org b/layers/+tags/cscope/README.org
similarity index 100%
rename from layers/cscope/README.org
rename to layers/+tags/cscope/README.org
diff --git a/layers/cscope/img/cscope.jpg b/layers/+tags/cscope/img/cscope.jpg
similarity index 100%
rename from layers/cscope/img/cscope.jpg
rename to layers/+tags/cscope/img/cscope.jpg
diff --git a/layers/cscope/packages.el b/layers/+tags/cscope/packages.el
similarity index 100%
rename from layers/cscope/packages.el
rename to layers/+tags/cscope/packages.el
diff --git a/layers/gtags/README.org b/layers/+tags/gtags/README.org
similarity index 100%
rename from layers/gtags/README.org
rename to layers/+tags/gtags/README.org
diff --git a/layers/gtags/funcs.el b/layers/+tags/gtags/funcs.el
similarity index 100%
rename from layers/gtags/funcs.el
rename to layers/+tags/gtags/funcs.el
diff --git a/layers/gtags/packages.el b/layers/+tags/gtags/packages.el
similarity index 100%
rename from layers/gtags/packages.el
rename to layers/+tags/gtags/packages.el
diff --git a/layers/colors/README.org b/layers/+themes/colors/README.org
similarity index 100%
rename from layers/colors/README.org
rename to layers/+themes/colors/README.org
diff --git a/layers/colors/config.el b/layers/+themes/colors/config.el
similarity index 100%
rename from layers/colors/config.el
rename to layers/+themes/colors/config.el
diff --git a/layers/colors/img/rainbow-mode.png b/layers/+themes/colors/img/rainbow-mode.png
similarity index 100%
rename from layers/colors/img/rainbow-mode.png
rename to layers/+themes/colors/img/rainbow-mode.png
diff --git a/layers/colors/img/rainbow_dash.png b/layers/+themes/colors/img/rainbow_dash.png
similarity index 100%
rename from layers/colors/img/rainbow_dash.png
rename to layers/+themes/colors/img/rainbow_dash.png
diff --git a/layers/colors/img/theme-tweaks-python.png b/layers/+themes/colors/img/theme-tweaks-python.png
similarity index 100%
rename from layers/colors/img/theme-tweaks-python.png
rename to layers/+themes/colors/img/theme-tweaks-python.png
diff --git a/layers/colors/local/nyan-mode/README.org b/layers/+themes/colors/local/nyan-mode/README.org
similarity index 100%
rename from layers/colors/local/nyan-mode/README.org
rename to layers/+themes/colors/local/nyan-mode/README.org
diff --git a/layers/colors/local/nyan-mode/img/nyan-frame-1.xpm b/layers/+themes/colors/local/nyan-mode/img/nyan-frame-1.xpm
similarity index 100%
rename from layers/colors/local/nyan-mode/img/nyan-frame-1.xpm
rename to layers/+themes/colors/local/nyan-mode/img/nyan-frame-1.xpm
diff --git a/layers/colors/local/nyan-mode/img/nyan-frame-2.xpm b/layers/+themes/colors/local/nyan-mode/img/nyan-frame-2.xpm
similarity index 100%
rename from layers/colors/local/nyan-mode/img/nyan-frame-2.xpm
rename to layers/+themes/colors/local/nyan-mode/img/nyan-frame-2.xpm
diff --git a/layers/colors/local/nyan-mode/img/nyan-frame-3.xpm b/layers/+themes/colors/local/nyan-mode/img/nyan-frame-3.xpm
similarity index 100%
rename from layers/colors/local/nyan-mode/img/nyan-frame-3.xpm
rename to layers/+themes/colors/local/nyan-mode/img/nyan-frame-3.xpm
diff --git a/layers/colors/local/nyan-mode/img/nyan-frame-4.xpm b/layers/+themes/colors/local/nyan-mode/img/nyan-frame-4.xpm
similarity index 100%
rename from layers/colors/local/nyan-mode/img/nyan-frame-4.xpm
rename to layers/+themes/colors/local/nyan-mode/img/nyan-frame-4.xpm
diff --git a/layers/colors/local/nyan-mode/img/nyan-frame-5.xpm b/layers/+themes/colors/local/nyan-mode/img/nyan-frame-5.xpm
similarity index 100%
rename from layers/colors/local/nyan-mode/img/nyan-frame-5.xpm
rename to layers/+themes/colors/local/nyan-mode/img/nyan-frame-5.xpm
diff --git a/layers/colors/local/nyan-mode/img/nyan-frame-6.xpm b/layers/+themes/colors/local/nyan-mode/img/nyan-frame-6.xpm
similarity index 100%
rename from layers/colors/local/nyan-mode/img/nyan-frame-6.xpm
rename to layers/+themes/colors/local/nyan-mode/img/nyan-frame-6.xpm
diff --git a/layers/colors/local/nyan-mode/img/nyan-start.xpm b/layers/+themes/colors/local/nyan-mode/img/nyan-start.xpm
similarity index 100%
rename from layers/colors/local/nyan-mode/img/nyan-start.xpm
rename to layers/+themes/colors/local/nyan-mode/img/nyan-start.xpm
diff --git a/layers/colors/local/nyan-mode/img/nyan.xpm b/layers/+themes/colors/local/nyan-mode/img/nyan.xpm
similarity index 100%
rename from layers/colors/local/nyan-mode/img/nyan.xpm
rename to layers/+themes/colors/local/nyan-mode/img/nyan.xpm
diff --git a/layers/colors/local/nyan-mode/img/outerspace.xpm b/layers/+themes/colors/local/nyan-mode/img/outerspace.xpm
similarity index 100%
rename from layers/colors/local/nyan-mode/img/outerspace.xpm
rename to layers/+themes/colors/local/nyan-mode/img/outerspace.xpm
diff --git a/layers/colors/local/nyan-mode/img/rainbow-start.xpm b/layers/+themes/colors/local/nyan-mode/img/rainbow-start.xpm
similarity index 100%
rename from layers/colors/local/nyan-mode/img/rainbow-start.xpm
rename to layers/+themes/colors/local/nyan-mode/img/rainbow-start.xpm
diff --git a/layers/colors/local/nyan-mode/img/rainbow.xpm b/layers/+themes/colors/local/nyan-mode/img/rainbow.xpm
similarity index 100%
rename from layers/colors/local/nyan-mode/img/rainbow.xpm
rename to layers/+themes/colors/local/nyan-mode/img/rainbow.xpm
diff --git a/layers/colors/local/nyan-mode/mus/nyanlooped.mp3 b/layers/+themes/colors/local/nyan-mode/mus/nyanlooped.mp3
similarity index 100%
rename from layers/colors/local/nyan-mode/mus/nyanlooped.mp3
rename to layers/+themes/colors/local/nyan-mode/mus/nyanlooped.mp3
diff --git a/layers/colors/local/nyan-mode/nyan-mode.el b/layers/+themes/colors/local/nyan-mode/nyan-mode.el
similarity index 100%
rename from layers/colors/local/nyan-mode/nyan-mode.el
rename to layers/+themes/colors/local/nyan-mode/nyan-mode.el
diff --git a/layers/colors/packages.el b/layers/+themes/colors/packages.el
similarity index 100%
rename from layers/colors/packages.el
rename to layers/+themes/colors/packages.el
diff --git a/layers/themes-megapack/README.org b/layers/+themes/themes-megapack/README.org
similarity index 100%
rename from layers/themes-megapack/README.org
rename to layers/+themes/themes-megapack/README.org
diff --git a/layers/themes-megapack/packages.el b/layers/+themes/themes-megapack/packages.el
similarity index 100%
rename from layers/themes-megapack/packages.el
rename to layers/+themes/themes-megapack/packages.el
diff --git a/layers/theming/README.org b/layers/+themes/theming/README.org
similarity index 100%
rename from layers/theming/README.org
rename to layers/+themes/theming/README.org
diff --git a/layers/theming/config.el b/layers/+themes/theming/config.el
similarity index 100%
rename from layers/theming/config.el
rename to layers/+themes/theming/config.el
diff --git a/layers/theming/funcs.el b/layers/+themes/theming/funcs.el
similarity index 100%
rename from layers/theming/funcs.el
rename to layers/+themes/theming/funcs.el
diff --git a/layers/chrome/README.org b/layers/+tools/chrome/README.org
similarity index 100%
rename from layers/chrome/README.org
rename to layers/+tools/chrome/README.org
diff --git a/layers/chrome/img/chrome.png b/layers/+tools/chrome/img/chrome.png
similarity index 100%
rename from layers/chrome/img/chrome.png
rename to layers/+tools/chrome/img/chrome.png
diff --git a/layers/chrome/packages.el b/layers/+tools/chrome/packages.el
similarity index 100%
rename from layers/chrome/packages.el
rename to layers/+tools/chrome/packages.el
diff --git a/layers/deft/README.org b/layers/+tools/deft/README.org
similarity index 100%
rename from layers/deft/README.org
rename to layers/+tools/deft/README.org
diff --git a/layers/deft/packages.el b/layers/+tools/deft/packages.el
similarity index 100%
rename from layers/deft/packages.el
rename to layers/+tools/deft/packages.el
diff --git a/layers/finance/README.org b/layers/+tools/finance/README.org
similarity index 100%
rename from layers/finance/README.org
rename to layers/+tools/finance/README.org
diff --git a/layers/finance/config.el b/layers/+tools/finance/config.el
similarity index 100%
rename from layers/finance/config.el
rename to layers/+tools/finance/config.el
diff --git a/layers/finance/img/ledger.png b/layers/+tools/finance/img/ledger.png
similarity index 100%
rename from layers/finance/img/ledger.png
rename to layers/+tools/finance/img/ledger.png
diff --git a/layers/finance/packages.el b/layers/+tools/finance/packages.el
similarity index 100%
rename from layers/finance/packages.el
rename to layers/+tools/finance/packages.el
diff --git a/layers/geolocation/README.org b/layers/+tools/geolocation/README.org
similarity index 100%
rename from layers/geolocation/README.org
rename to layers/+tools/geolocation/README.org
diff --git a/layers/geolocation/config.el b/layers/+tools/geolocation/config.el
similarity index 100%
rename from layers/geolocation/config.el
rename to layers/+tools/geolocation/config.el
diff --git a/layers/geolocation/extensions.el b/layers/+tools/geolocation/extensions.el
similarity index 100%
rename from layers/geolocation/extensions.el
rename to layers/+tools/geolocation/extensions.el
diff --git a/layers/geolocation/extensions/theme-changer/theme-changer.el b/layers/+tools/geolocation/extensions/theme-changer/theme-changer.el
similarity index 100%
rename from layers/geolocation/extensions/theme-changer/theme-changer.el
rename to layers/+tools/geolocation/extensions/theme-changer/theme-changer.el
diff --git a/layers/geolocation/img/emacs-location-helper.jpg b/layers/+tools/geolocation/img/emacs-location-helper.jpg
similarity index 100%
rename from layers/geolocation/img/emacs-location-helper.jpg
rename to layers/+tools/geolocation/img/emacs-location-helper.jpg
diff --git a/layers/geolocation/img/emacs-sunshine.jpg b/layers/+tools/geolocation/img/emacs-sunshine.jpg
similarity index 100%
rename from layers/geolocation/img/emacs-sunshine.jpg
rename to layers/+tools/geolocation/img/emacs-sunshine.jpg
diff --git a/layers/geolocation/packages.el b/layers/+tools/geolocation/packages.el
similarity index 100%
rename from layers/geolocation/packages.el
rename to layers/+tools/geolocation/packages.el
diff --git a/layers/prodigy/README.org b/layers/+tools/prodigy/README.org
similarity index 100%
rename from layers/prodigy/README.org
rename to layers/+tools/prodigy/README.org
diff --git a/layers/prodigy/img/prodigy.png b/layers/+tools/prodigy/img/prodigy.png
similarity index 100%
rename from layers/prodigy/img/prodigy.png
rename to layers/+tools/prodigy/img/prodigy.png
diff --git a/layers/prodigy/packages.el b/layers/+tools/prodigy/packages.el
similarity index 100%
rename from layers/prodigy/packages.el
rename to layers/+tools/prodigy/packages.el
diff --git a/layers/restclient/README.org b/layers/+tools/restclient/README.org
similarity index 100%
rename from layers/restclient/README.org
rename to layers/+tools/restclient/README.org
diff --git a/layers/restclient/config.el b/layers/+tools/restclient/config.el
similarity index 100%
rename from layers/restclient/config.el
rename to layers/+tools/restclient/config.el
diff --git a/layers/restclient/funcs.el b/layers/+tools/restclient/funcs.el
similarity index 100%
rename from layers/restclient/funcs.el
rename to layers/+tools/restclient/funcs.el
diff --git a/layers/restclient/packages.el b/layers/+tools/restclient/packages.el
similarity index 100%
rename from layers/restclient/packages.el
rename to layers/+tools/restclient/packages.el
diff --git a/layers/shell/README.org b/layers/+tools/shell/README.org
similarity index 100%
rename from layers/shell/README.org
rename to layers/+tools/shell/README.org
diff --git a/layers/shell/config.el b/layers/+tools/shell/config.el
similarity index 100%
rename from layers/shell/config.el
rename to layers/+tools/shell/config.el
diff --git a/layers/shell/funcs.el b/layers/+tools/shell/funcs.el
similarity index 100%
rename from layers/shell/funcs.el
rename to layers/+tools/shell/funcs.el
diff --git a/layers/shell/img/shell.png b/layers/+tools/shell/img/shell.png
similarity index 100%
rename from layers/shell/img/shell.png
rename to layers/+tools/shell/img/shell.png
diff --git a/layers/shell/packages.el b/layers/+tools/shell/packages.el
similarity index 100%
rename from layers/shell/packages.el
rename to layers/+tools/shell/packages.el
diff --git a/layers/speed-reading/README.org b/layers/+tools/speed-reading/README.org
similarity index 100%
rename from layers/speed-reading/README.org
rename to layers/+tools/speed-reading/README.org
diff --git a/layers/speed-reading/packages.el b/layers/+tools/speed-reading/packages.el
similarity index 100%
rename from layers/speed-reading/packages.el
rename to layers/+tools/speed-reading/packages.el
diff --git a/layers/+tools/elfeed/README.org b/layers/+web-services/elfeed/README.org
similarity index 100%
rename from layers/+tools/elfeed/README.org
rename to layers/+web-services/elfeed/README.org
diff --git a/layers/+tools/elfeed/config.el b/layers/+web-services/elfeed/config.el
similarity index 100%
rename from layers/+tools/elfeed/config.el
rename to layers/+web-services/elfeed/config.el
diff --git a/layers/+tools/elfeed/img/elfeed.png b/layers/+web-services/elfeed/img/elfeed.png
similarity index 100%
rename from layers/+tools/elfeed/img/elfeed.png
rename to layers/+web-services/elfeed/img/elfeed.png
diff --git a/layers/+tools/elfeed/packages-config.el b/layers/+web-services/elfeed/packages-config.el
similarity index 100%
rename from layers/+tools/elfeed/packages-config.el
rename to layers/+web-services/elfeed/packages-config.el
diff --git a/layers/+tools/elfeed/packages.el b/layers/+web-services/elfeed/packages.el
similarity index 100%
rename from layers/+tools/elfeed/packages.el
rename to layers/+web-services/elfeed/packages.el
diff --git a/layers/+tools/evernote/README.org b/layers/+web-services/evernote/README.org
similarity index 100%
rename from layers/+tools/evernote/README.org
rename to layers/+web-services/evernote/README.org
diff --git a/layers/+tools/evernote/config.el b/layers/+web-services/evernote/config.el
similarity index 100%
rename from layers/+tools/evernote/config.el
rename to layers/+web-services/evernote/config.el
diff --git a/layers/+tools/evernote/img/evernote.png b/layers/+web-services/evernote/img/evernote.png
similarity index 100%
rename from layers/+tools/evernote/img/evernote.png
rename to layers/+web-services/evernote/img/evernote.png
diff --git a/layers/+tools/evernote/img/geeknote.png b/layers/+web-services/evernote/img/geeknote.png
similarity index 100%
rename from layers/+tools/evernote/img/geeknote.png
rename to layers/+web-services/evernote/img/geeknote.png
diff --git a/layers/+tools/evernote/packages.el b/layers/+web-services/evernote/packages.el
similarity index 100%
rename from layers/+tools/evernote/packages.el
rename to layers/+web-services/evernote/packages.el
diff --git a/layers/search-engine/README.org b/layers/+web-services/search-engine/README.org
similarity index 100%
rename from layers/search-engine/README.org
rename to layers/+web-services/search-engine/README.org
diff --git a/layers/search-engine/img/searchengine.jpg b/layers/+web-services/search-engine/img/searchengine.jpg
similarity index 100%
rename from layers/search-engine/img/searchengine.jpg
rename to layers/+web-services/search-engine/img/searchengine.jpg
diff --git a/layers/search-engine/packages.el b/layers/+web-services/search-engine/packages.el
similarity index 100%
rename from layers/search-engine/packages.el
rename to layers/+web-services/search-engine/packages.el
diff --git a/layers/spotify/README.org b/layers/+web-services/spotify/README.org
similarity index 100%
rename from layers/spotify/README.org
rename to layers/+web-services/spotify/README.org
diff --git a/layers/spotify/config.el b/layers/+web-services/spotify/config.el
similarity index 100%
rename from layers/spotify/config.el
rename to layers/+web-services/spotify/config.el
diff --git a/layers/spotify/img/spotify.png b/layers/+web-services/spotify/img/spotify.png
similarity index 100%
rename from layers/spotify/img/spotify.png
rename to layers/+web-services/spotify/img/spotify.png
diff --git a/layers/spotify/packages.el b/layers/+web-services/spotify/packages.el
similarity index 100%
rename from layers/spotify/packages.el
rename to layers/+web-services/spotify/packages.el
diff --git a/layers/+fun/twitter/README.org b/layers/+web-services/twitter/README.org
similarity index 100%
rename from layers/+fun/twitter/README.org
rename to layers/+web-services/twitter/README.org
diff --git a/layers/+fun/twitter/img/twitter.png b/layers/+web-services/twitter/img/twitter.png
similarity index 100%
rename from layers/+fun/twitter/img/twitter.png
rename to layers/+web-services/twitter/img/twitter.png
diff --git a/layers/+fun/twitter/packages.el b/layers/+web-services/twitter/packages.el
similarity index 100%
rename from layers/+fun/twitter/packages.el
rename to layers/+web-services/twitter/packages.el
diff --git a/layers/+tools/wakatime/README.org b/layers/+web-services/wakatime/README.org
similarity index 100%
rename from layers/+tools/wakatime/README.org
rename to layers/+web-services/wakatime/README.org
diff --git a/layers/+tools/wakatime/img/wakatime.png b/layers/+web-services/wakatime/img/wakatime.png
similarity index 100%
rename from layers/+tools/wakatime/img/wakatime.png
rename to layers/+web-services/wakatime/img/wakatime.png
diff --git a/layers/+tools/wakatime/packages.el b/layers/+web-services/wakatime/packages.el
similarity index 100%
rename from layers/+tools/wakatime/packages.el
rename to layers/+web-services/wakatime/packages.el