diff --git a/README.md b/README.md
index a35f529f..8f6742ef 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 - [ ] Homebrew casks cli (skipped?)
 - [x] Ansible vault
 - [ ] SSH config?
-- [ ] irssi, mutt
+- [ ] assemble (tmux: Wheel Pane, vim: Plug...)
 
 ## Install
 
diff --git a/ansible.cfg b/ansible.cfg
index ed4b9f51..c24a7755 100644
--- a/ansible.cfg
+++ b/ansible.cfg
@@ -2,7 +2,7 @@
 inventory = hosts
 
 # Additional paths to search for roles in, colon separated
-roles_path = roles.galaxy:roles.core:roles
+roles_path = roles.galaxy:roles.core:roles.os:roles
 
 # Set plugin path directories
 filter_plugins = /usr/share/ansible/plugins/filter:plugins/filters
diff --git a/roles/apt/defaults/main.yml b/roles.os/apt/defaults/main.yml
similarity index 100%
rename from roles/apt/defaults/main.yml
rename to roles.os/apt/defaults/main.yml
diff --git a/roles/apt/tasks/main.yml b/roles.os/apt/tasks/main.yml
similarity index 100%
rename from roles/apt/tasks/main.yml
rename to roles.os/apt/tasks/main.yml
diff --git a/roles/cask/defaults/main.yml b/roles.os/cask/defaults/main.yml
similarity index 100%
rename from roles/cask/defaults/main.yml
rename to roles.os/cask/defaults/main.yml
diff --git a/roles/cask/meta/main.yml b/roles.os/cask/meta/main.yml
similarity index 100%
rename from roles/cask/meta/main.yml
rename to roles.os/cask/meta/main.yml
diff --git a/roles/cask/tasks/main.yml b/roles.os/cask/tasks/main.yml
similarity index 100%
rename from roles/cask/tasks/main.yml
rename to roles.os/cask/tasks/main.yml
diff --git a/roles/homebrew/defaults/main.yml b/roles.os/homebrew/defaults/main.yml
similarity index 100%
rename from roles/homebrew/defaults/main.yml
rename to roles.os/homebrew/defaults/main.yml
diff --git a/roles/homebrew/meta/main.yml b/roles.os/homebrew/meta/main.yml
similarity index 100%
rename from roles/homebrew/meta/main.yml
rename to roles.os/homebrew/meta/main.yml
diff --git a/roles/homebrew/tasks/main.yml b/roles.os/homebrew/tasks/main.yml
similarity index 100%
rename from roles/homebrew/tasks/main.yml
rename to roles.os/homebrew/tasks/main.yml
diff --git a/roles/mintty/files/minttyrc b/roles.os/mintty/files/minttyrc
similarity index 100%
rename from roles/mintty/files/minttyrc
rename to roles.os/mintty/files/minttyrc
diff --git a/roles/osx/files/.gitignore b/roles.os/osx/files/.gitignore
similarity index 100%
rename from roles/osx/files/.gitignore
rename to roles.os/osx/files/.gitignore
diff --git a/roles/osx/files/Base16TomorrowDark.terminal b/roles.os/osx/files/Base16TomorrowDark.terminal
similarity index 100%
rename from roles/osx/files/Base16TomorrowDark.terminal
rename to roles.os/osx/files/Base16TomorrowDark.terminal
diff --git a/roles/osx/tasks/main.yml b/roles.os/osx/tasks/main.yml
similarity index 100%
rename from roles/osx/tasks/main.yml
rename to roles.os/osx/tasks/main.yml
diff --git a/roles/osx/templates/defaults.sh.j2 b/roles.os/osx/templates/defaults.sh.j2
similarity index 100%
rename from roles/osx/templates/defaults.sh.j2
rename to roles.os/osx/templates/defaults.sh.j2
diff --git a/roles/osx/templates/terminal.scpt.j2 b/roles.os/osx/templates/terminal.scpt.j2
similarity index 100%
rename from roles/osx/templates/terminal.scpt.j2
rename to roles.os/osx/templates/terminal.scpt.j2
diff --git a/roles/osx/vars/main.yml b/roles.os/osx/vars/main.yml
similarity index 100%
rename from roles/osx/vars/main.yml
rename to roles.os/osx/vars/main.yml
diff --git a/roles/tmux/files/tmux.conf b/roles/tmux/files/tmux.conf
index 6ac6c038..51ab0868 100644
--- a/roles/tmux/files/tmux.conf
+++ b/roles/tmux/files/tmux.conf
@@ -1,4 +1,4 @@
-# .tmux.conf
+# Ansible managed: /home/demo/.dotfiles/roles/tmux/templates/tmux.conf.j2 on debian-jessie
 # vim: foldenable foldmethod=marker foldmarker={,}
 
 # ! https://github.com/tmux-plugins/tpm