diff --git a/dotfiles.yml b/local.yml
similarity index 94%
rename from dotfiles.yml
rename to local.yml
index 8d976b3..658565f 100644
--- a/dotfiles.yml
+++ b/local.yml
@@ -8,5 +8,5 @@
     private: no
     default: fernando@schauenburg.me
   roles:
-  - common
+  - dotfiles
 
diff --git a/roles/common/files/bashrc b/roles/dotfiles/files/bashrc
similarity index 100%
rename from roles/common/files/bashrc
rename to roles/dotfiles/files/bashrc
diff --git a/roles/common/files/bin/git-churn b/roles/dotfiles/files/bin/git-churn
similarity index 100%
rename from roles/common/files/bin/git-churn
rename to roles/dotfiles/files/bin/git-churn
diff --git a/roles/common/files/bin/git-what-the-hell-just-happened b/roles/dotfiles/files/bin/git-what-the-hell-just-happened
similarity index 100%
rename from roles/common/files/bin/git-what-the-hell-just-happened
rename to roles/dotfiles/files/bin/git-what-the-hell-just-happened
diff --git a/roles/common/files/bin/git-wtf b/roles/dotfiles/files/bin/git-wtf
similarity index 100%
rename from roles/common/files/bin/git-wtf
rename to roles/dotfiles/files/bin/git-wtf
diff --git a/roles/common/files/bin/vboxmount b/roles/dotfiles/files/bin/vboxmount
similarity index 100%
rename from roles/common/files/bin/vboxmount
rename to roles/dotfiles/files/bin/vboxmount
diff --git a/roles/common/files/dircolors/solarized-dark b/roles/dotfiles/files/dircolors/solarized-dark
similarity index 100%
rename from roles/common/files/dircolors/solarized-dark
rename to roles/dotfiles/files/dircolors/solarized-dark
diff --git a/roles/common/files/dircolors/solarized-light b/roles/dotfiles/files/dircolors/solarized-light
similarity index 100%
rename from roles/common/files/dircolors/solarized-light
rename to roles/dotfiles/files/dircolors/solarized-light
diff --git a/roles/common/files/gitconfig b/roles/dotfiles/files/gitconfig
similarity index 100%
rename from roles/common/files/gitconfig
rename to roles/dotfiles/files/gitconfig
diff --git a/roles/common/files/gitignore b/roles/dotfiles/files/gitignore
similarity index 100%
rename from roles/common/files/gitignore
rename to roles/dotfiles/files/gitignore
diff --git a/roles/common/files/inputrc b/roles/dotfiles/files/inputrc
similarity index 100%
rename from roles/common/files/inputrc
rename to roles/dotfiles/files/inputrc
diff --git a/roles/common/files/minttyrc b/roles/dotfiles/files/minttyrc
similarity index 100%
rename from roles/common/files/minttyrc
rename to roles/dotfiles/files/minttyrc
diff --git a/roles/common/files/plug.vim b/roles/dotfiles/files/plug.vim
similarity index 100%
rename from roles/common/files/plug.vim
rename to roles/dotfiles/files/plug.vim
diff --git a/roles/common/files/python-startup.py b/roles/dotfiles/files/python-startup.py
similarity index 100%
rename from roles/common/files/python-startup.py
rename to roles/dotfiles/files/python-startup.py
diff --git a/roles/common/files/ssh_config b/roles/dotfiles/files/ssh_config
similarity index 100%
rename from roles/common/files/ssh_config
rename to roles/dotfiles/files/ssh_config
diff --git a/roles/common/files/tmux-colors.conf b/roles/dotfiles/files/tmux-colors.conf
similarity index 100%
rename from roles/common/files/tmux-colors.conf
rename to roles/dotfiles/files/tmux-colors.conf
diff --git a/roles/common/files/tmux.conf b/roles/dotfiles/files/tmux.conf
similarity index 100%
rename from roles/common/files/tmux.conf
rename to roles/dotfiles/files/tmux.conf
diff --git a/roles/common/files/vimrc b/roles/dotfiles/files/vimrc
similarity index 100%
rename from roles/common/files/vimrc
rename to roles/dotfiles/files/vimrc
diff --git a/roles/common/tasks/main.yml b/roles/dotfiles/tasks/main.yml
similarity index 100%
rename from roles/common/tasks/main.yml
rename to roles/dotfiles/tasks/main.yml
diff --git a/roles/common/templates/gitconfig.host.j2 b/roles/dotfiles/templates/gitconfig.host.j2
similarity index 100%
rename from roles/common/templates/gitconfig.host.j2
rename to roles/dotfiles/templates/gitconfig.host.j2
diff --git a/roles/common/tasks/packages.yml b/roles/packages/tasks/main.yml
similarity index 100%
rename from roles/common/tasks/packages.yml
rename to roles/packages/tasks/main.yml