diff --git a/Makefile b/Makefile
index fed7fef..c07168c 100644
--- a/Makefile
+++ b/Makefile
@@ -2,12 +2,18 @@ linux: link bash_git_prompt tmux vim
 macos: link bash_git_prompt brew cask tmux vim
 
 link:
-	-ln -s ~/Git/dotfiles/.bash_aliases ~
-	-ln -s ~/Git/dotfiles/.bashrc ~
-	-ln -s ~/Git/dotfiles/.bash_profile ~
-	-ln -s ~/Git/dotfiles/.git-completion.bash ~
-	-ln -s ~/Git/dotfiles/.gitconfig ~
-	-ln -s ~/Git/dotfiles/.tmux.conf ~
+	-rm ~/.bash_aliases
+	-rm ~/.bashrc
+	-rm ~/.bash_profile
+	-rm ~/.git-completion.bash
+	-rm ~/.gitconfig
+	-rm ~/.tmux.conf
+	-ln -s ~/Git/dotfiles/bash/.bash_aliases ~
+	-ln -s ~/Git/dotfiles/bash/.bashrc ~
+	-ln -s ~/Git/dotfiles/bash/.bash_profile ~
+	-ln -s ~/Git/dotfiles/git/.git-completion.bash ~
+	-ln -s ~/Git/dotfiles/git/.gitconfig ~
+	-ln -s ~/Git/dotfiles/tmux/.tmux.conf ~
 
 brew:
 	-./macos/install_brew.sh
@@ -21,11 +27,12 @@ cask_personal:
 
 tmux:
 	-git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm
-	-ln -s ~/Git/dotfiles/.tmux/themes ~/.tmux/themes
+	-ln -s ~/Git/dotfiles/tmux/themes ~/.tmux/themes
 
 bash_git_prompt:
 	-git clone https://github.com/magicmonty/bash-git-prompt.git ~/.bash-git-prompt --depth=1
-	-ln -s ~/Git/dotfiles/.git-prompt-colors.sh ~
+	-rm ~/.git-prompt-colors
+	-ln -s ~/Git/dotfiles/git/.git-prompt-colors.sh ~
 
 vim:
 	-ln -s ~/Git/dotfiles/.vim ~
diff --git a/.bash_aliases b/bash/.bash_aliases
similarity index 100%
rename from .bash_aliases
rename to bash/.bash_aliases
diff --git a/.bash_profile b/bash/.bash_profile
similarity index 100%
rename from .bash_profile
rename to bash/.bash_profile
diff --git a/.bashrc b/bash/.bashrc
similarity index 100%
rename from .bashrc
rename to bash/.bashrc
diff --git a/.git-completion.bash b/git/.git-completion.bash
similarity index 100%
rename from .git-completion.bash
rename to git/.git-completion.bash
diff --git a/.git-prompt-colors.sh b/git/.git-prompt-colors.sh
similarity index 100%
rename from .git-prompt-colors.sh
rename to git/.git-prompt-colors.sh
diff --git a/.gitconfig b/git/.gitconfig
similarity index 100%
rename from .gitconfig
rename to git/.gitconfig
diff --git a/.tmux.conf b/tmux/.tmux.conf
similarity index 100%
rename from .tmux.conf
rename to tmux/.tmux.conf
diff --git a/.tmux/themes/tomorrow-night.tmux b/tmux/themes/tomorrow-night.tmux
similarity index 100%
rename from .tmux/themes/tomorrow-night.tmux
rename to tmux/themes/tomorrow-night.tmux