diff --git a/.gitignore b/.gitignore
index 5913867..ed1efba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-subvim/bundle
-subzsh/plugins
+sub/vim/bundle
+sub/zsh/plugins
diff --git a/Makefile b/Makefile
index acf28d0..c2ac117 100644
--- a/Makefile
+++ b/Makefile
@@ -14,12 +14,12 @@ backup:
 
 bash:
 	test -e ~/.subbash || \
-	ln -s $(PWD)/subbash ~/.subbash
+	ln -s $(PWD)/sub/bash ~/.subbash
 	ln -s ~/.subbash/bashrc ~/.bashrc
 
 zsh:
 	test -e ~/.subzsh || \
-	ln -s $(PWD)/subzsh ~/.subzsh
+	ln -s $(PWD)/sub/zsh ~/.subzsh
 	ln -s ~/.subzsh/zshrc ~/.zshrc
 	mkdir ~/.subzsh/plugins
 	git clone https://github.com/zsh-users/zsh-autosuggestions ~/.subzsh/plugins/zsh-autosuggestions
@@ -27,28 +27,28 @@ zsh:
 
 
 tmux:
-	ln -s $(PWD)/subtmux/tmux.conf ~/.tmux.conf
+	ln -s $(PWD)/sub/tmux/tmux.conf ~/.tmux.conf
 
 vim:
 	test -e ~/.vim || \
-	ln -s $(PWD)/subvim ~/.vim
+	ln -s $(PWD)/sub/vim ~/.vim
 	ln -s ~/.vim/.vimrc ~/.vimrc
 	mkdir -p ~/.config/nvim
 	ln -s ~/.vim/.vimrc ~/.config/nvim/init.vim
-	git clone https://github.com/VundleVim/Vundle.vim.git $(PWD)/subvim/bundle/Vundle.vim
+	git clone https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim
 	vim +PluginInstall +qall
 
 ssh:
-	cat $(PWD)/subssh/config >> ~/.ssh/config
+	cat $(PWD)/sub/ssh/config >> ~/.ssh/config
 
 git:
-	ln -s $(PWD)/subgit/gitconfig ~/.gitconfig
-	ln -s $(PWD)/subgit/gitignore ~/.gitignore
+	ln -s $(PWD)/sub/git/gitconfig ~/.gitconfig
+	ln -s $(PWD)/sub/git/gitignore ~/.gitignore
 
 ranger:
 	test -e ~/.config/ranger || \
 	mkdir -p ~/.config/ranger
-	ln -s $(PWD)/subranger/rc.conf ~/.config/ranger
+	ln -s $(PWD)/sub/ranger/rc.conf ~/.config/ranger
 	mkdir -p ~/.config/ranger/plugins
 	git clone https://github.com/alexanderjeurissen/ranger_devicons ~/.config/ranger/plugins/ranger_devicons
 
diff --git a/subbash/aliases b/sub/bash/aliases
similarity index 100%
rename from subbash/aliases
rename to sub/bash/aliases
diff --git a/subbash/bashrc b/sub/bash/bashrc
similarity index 100%
rename from subbash/bashrc
rename to sub/bash/bashrc
diff --git a/subbash/completion b/sub/bash/completion
similarity index 100%
rename from subbash/completion
rename to sub/bash/completion
diff --git a/subbash/export b/sub/bash/export
similarity index 100%
rename from subbash/export
rename to sub/bash/export
diff --git a/subbash/functions b/sub/bash/functions
similarity index 100%
rename from subbash/functions
rename to sub/bash/functions
diff --git a/subbash/prompt b/sub/bash/prompt
similarity index 100%
rename from subbash/prompt
rename to sub/bash/prompt
diff --git a/subbash/shopt b/sub/bash/shopt
similarity index 100%
rename from subbash/shopt
rename to sub/bash/shopt
diff --git a/subbash/sourcer b/sub/bash/sourcer
similarity index 100%
rename from subbash/sourcer
rename to sub/bash/sourcer
diff --git a/subgit/gitconfig b/sub/git/gitconfig
similarity index 100%
rename from subgit/gitconfig
rename to sub/git/gitconfig
diff --git a/subgit/gitignore b/sub/git/gitignore
similarity index 100%
rename from subgit/gitignore
rename to sub/git/gitignore
diff --git a/subranger/rc.conf b/sub/ranger/rc.conf
similarity index 100%
rename from subranger/rc.conf
rename to sub/ranger/rc.conf
diff --git a/subssh/config b/sub/ssh/config
similarity index 100%
rename from subssh/config
rename to sub/ssh/config
diff --git a/subtmux/tmux.conf b/sub/tmux/tmux.conf
similarity index 100%
rename from subtmux/tmux.conf
rename to sub/tmux/tmux.conf
diff --git a/subvim/.vimrc b/sub/vim/.vimrc
similarity index 100%
rename from subvim/.vimrc
rename to sub/vim/.vimrc
diff --git a/subzsh/completion b/sub/zsh/completion
similarity index 100%
rename from subzsh/completion
rename to sub/zsh/completion
diff --git a/subzsh/history b/sub/zsh/history
similarity index 100%
rename from subzsh/history
rename to sub/zsh/history
diff --git a/subzsh/options b/sub/zsh/options
similarity index 100%
rename from subzsh/options
rename to sub/zsh/options
diff --git a/subzsh/other b/sub/zsh/other
similarity index 100%
rename from subzsh/other
rename to sub/zsh/other
diff --git a/subzsh/plugin b/sub/zsh/plugin
similarity index 100%
rename from subzsh/plugin
rename to sub/zsh/plugin
diff --git a/subzsh/prompt b/sub/zsh/prompt
similarity index 100%
rename from subzsh/prompt
rename to sub/zsh/prompt
diff --git a/subzsh/sourcer b/sub/zsh/sourcer
similarity index 100%
rename from subzsh/sourcer
rename to sub/zsh/sourcer
diff --git a/subzsh/zshrc b/sub/zsh/zshrc
similarity index 100%
rename from subzsh/zshrc
rename to sub/zsh/zshrc