diff --git a/Cask b/Cask
index 77a6791ad..70df6dc19 100644
--- a/Cask
+++ b/Cask
@@ -49,6 +49,7 @@
 (depends-on "fancy-narrow")
 (depends-on "goto-last-change")
 (depends-on "hl-todo" :git "https://github.com/tarsius/hl-todo")
+(depends-on "rainbow-mode")
 (depends-on "rainbow-delimiters")
 (depends-on "rotate-text" :git "https://github.com/debug-ito/rotate-text.el")
 (depends-on "smart-forward")
@@ -58,18 +59,17 @@
 ;; Completion --- core/core-company.el
 (depends-on "company")
 (depends-on "company-c-headers")
-;; (depends-on "company-cmake")
 (depends-on "company-tern")
 (depends-on "company-anaconda")
 (depends-on "company-inf-ruby")
 (depends-on "company-statistics")
 
+;; Yasnippet --- core/core-yasnippet.el
+(depends-on "yasnippet")
+
 ;; Flycheck --- core/core-flycheck.el
 (depends-on "flycheck")
 (depends-on "flyspell")
-
-;; Yasnippet --- core/core-yasnippet.el
-(depends-on "yasnippet")
 ;; ...
 ;; Project --- core/core-project.el
 (depends-on "flx-ido")
@@ -98,69 +98,87 @@
 ;; Workgroups --- core/core-workgroups.el
 (depends-on "workgroups2")
 
-;;;; MODULES ;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-(depends-on "rainbow-mode")
-(depends-on "lua-mode")
-;; Text
-(depends-on "markdown-mode")
-;; Webdev
-(depends-on "haml-mode")
-(depends-on "scss-mode")
-(depends-on "sass-mode")
-(depends-on "sws-mode")
-(depends-on "jade-mode")
-(depends-on "web-mode")
-(depends-on "emmet-mode")
-(depends-on "web-beautify")
-;; JS
+;;;; MODULES ;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; C/C++ -- modules/module-cc.el
+(depends-on "cmake-mode")
+(depends-on "glsl-mode")
+
+;; Crystal -- modules/module-crystal.el
+(depends-on "crystal-mode" :git "https://github.com/jpellerin/emacs-crystal-mode")
+
+;; C# -- modules/module-csharp.el
+(depends-on "csharp-mode")
+(depends-on "omnisharp")
+(depends-on "shader-mode")
+
+;; Data -- modules/module-data.el
+(depends-on "json-mode")
+(depends-on "yaml-mode")
+
+;; Golang -- modules/module-go.el
+(depends-on "go-mode")
+(depends-on "go-eldoc")
+
+;; Java -- modules/module-java.el
+(depends-on "emacs-eclim")
+(depends-on "groovy-mode")
+(depends-on "android-mode")
+(depends-on "scala-mode2" :git "https://github.com/hvesalai/scala-mode2")
+
+;; JS -- modules/module-js.el
 (depends-on "js2-mode")
 (depends-on "js2-refactor")
 (depends-on "tern")
-;; Data
-(depends-on "json-mode")
-(depends-on "yaml-mode")
-;; PHP
+(depends-on "unityjs-mode" :git "https://github.com/naruse/EmacsUnityScript")
+
+;; Lua -- modules/module-lua.el
+(depends-on "lua-mode")
+
+;; Markdown -- modules/module-markdown.el
+(depends-on "markdown-mode")
+
+;; Org -- modules/module-org.el
+(depends-on "org-plus-contrib")
+(depends-on "org-opml" :git "https://github.com/edavis/org-opml")
+
+;; PHP -- modules/module-php.el
 (depends-on "php-mode")
 (depends-on "php-refactor-mode")
 (depends-on "php-extras" :git "https://github.com/arnested/php-extras")
-;; Ruby
+(depends-on "hack-mode"
+  :git "https://github.com/facebook/hhvm"
+  :files ("hphp/hack/editor-plugins/emacs/*.el"))
+
+;; Python -- modules/module-python.el
+(depends-on "anaconda-mode")
+(depends-on "nose")
+
+;; Ruby -- modules/module-ruby.el
 (depends-on "enh-ruby-mode")
 (depends-on "ruby-refactor")
 (depends-on "rspec-mode")
 (depends-on "inf-ruby")
 (depends-on "robe")
-;; Python
-(depends-on "anaconda-mode")
-(depends-on "nose")
-;; C#
-(depends-on "csharp-mode")
-(depends-on "omnisharp")
-;; Golang
-(depends-on "go-mode")
-(depends-on "go-eldoc")
-;; Java
-(depends-on "emacs-eclim")
-(depends-on "groovy-mode")
-(depends-on "android-mode")
-(depends-on "scala-mode2" :git "https://github.com/hvesalai/scala-mode2")
-;; C/C++
-(depends-on "cmake-mode")
-(depends-on "glsl-mode")
-;; Org
-(depends-on "org-plus-contrib")
-(depends-on "org-opml" :git "https://github.com/edavis/org-opml")
-(depends-on "org-bullets")
-;;(depends-on "org-tree-slide")
-;; Rust
+
+;; Rust -- modules/module-rust.el
 (depends-on "rust-mode")
 (depends-on "company-racer")
 (depends-on "racer")
 (depends-on "flycheck-rust")
-;; Other
-(depends-on "swift-mode")
-(depends-on "vimrc-mode")
-(depends-on "crystal-mode" :git "https://github.com/jpellerin/emacs-crystal-mode/")
 
-;; (depends-on "shaderlab-mode" :git "https://bitbucket.org/bbbscarter/emacs-shaderlab-mode")
-(depends-on "unityjs-mode" :git "https://github.com/naruse/EmacsUnityScript")
+;; Swift -- modules/module-swift.el
+(depends-on "swift-mode")
+
+;; Vim -- modules/module-vim.el
+(depends-on "vimrc-mode")
+
+;; Web -- modules/module-web.el
+(depends-on "web-beautify")
+(depends-on "jade-mode")
+(depends-on "web-mode")
+(depends-on "emmet-mode")
+(depends-on "haml-mode")
+(depends-on "scss-mode")
+(depends-on "sass-mode")
+(depends-on "sws-mode")