diff --git a/README.md b/README.md
index 2964fad1..eb037fca 100644
--- a/README.md
+++ b/README.md
@@ -59,7 +59,7 @@ This setup assumes you use oh-my-zsh (https://github.com/robbyrussell/oh-my-zsh)
 
 Place this as the last line in your ~/.zshrc created by oh-my-zsh:
 
-    source ~/.dotfiles/zshrc
+    source ~/.dotfiles/zsh/zshrc
 
 Lots of things I do every day are done with two or three character 
 mnemonic aliases. Please feel free to edit them:
diff --git a/aliases b/zsh/aliases
similarity index 93%
rename from aliases
rename to zsh/aliases
index ff9f1b11..aea05de2 100644
--- a/aliases
+++ b/zsh/aliases
@@ -1,3 +1,5 @@
+# Aliases in this file are bash and zsh compatible
+#
 # PS
 alias psg="ps aux | grep "
 alias psr='ps aux | grep ruby'
@@ -16,8 +18,8 @@ alias du='du -h -d 2'
 alias lsg='ll | grep'
 
 # Alias Editing
-alias ae='vi ~/.dotfiles/aliases' #alias edit
-alias ar='source ~/.dotfiles/aliases'  #alias reload
+alias ae='vi ~/.dotfiles/zsh/aliases' #alias edit
+alias ar='source ~/.dotfiles/zsh/aliases'  #alias reload
 
 # vimrc editing
 alias ve='vi ~/.vimrc'
diff --git a/zsh_aliases b/zsh/zsh_aliases
similarity index 100%
rename from zsh_aliases
rename to zsh/zsh_aliases
diff --git a/zshrc b/zsh/zshrc
similarity index 92%
rename from zshrc
rename to zsh/zshrc
index ba9de9e6..c48ed10c 100644
--- a/zshrc
+++ b/zsh/zshrc
@@ -1,6 +1,6 @@
 # Configuration
-source ~/.dotfiles/aliases
-source ~/.dotfiles/zsh_aliases
+source ~/.dotfiles/zsh/aliases
+source ~/.dotfiles/zsh/zsh_aliases
 
 # Things I don't want to publish to github
 source ~/.secrets