diff --git a/bash_aliases b/roles/bash/templates/bash_aliases
similarity index 54%
rename from bash_aliases
rename to roles/bash/templates/bash_aliases
index 88cc58a..df4fd51 100644
--- a/bash_aliases
+++ b/roles/bash/templates/bash_aliases
@@ -2,7 +2,14 @@
 alias ll='ls -al --color=auto'
 alias ls='ls -l --color=auto'
 
+alias nb=man
+alias enby=man
+
+alias furryfox=firefox
+
+alias flauschctl=systemctl
 
 # GnuPG2
 alias gpg=gpg2
 
+
diff --git a/bash_includes/mushy.sh b/roles/bash/templates/bash_includes/moshy.sh
similarity index 100%
rename from bash_includes/mushy.sh
rename to roles/bash/templates/bash_includes/moshy.sh
diff --git a/tmux/tmux.conf b/roles/tmux/templates/tmux.conf
similarity index 100%
rename from tmux/tmux.conf
rename to roles/tmux/templates/tmux.conf
diff --git a/vim/colors/kuroi.vim b/roles/vim/templates/colors/kuroi.vim
similarity index 100%
rename from vim/colors/kuroi.vim
rename to roles/vim/templates/colors/kuroi.vim
diff --git a/vim/vimrc b/roles/vim/templates/vimrc
similarity index 100%
rename from vim/vimrc
rename to roles/vim/templates/vimrc