diff --git a/bash/.bash_aliases b/bash/.bash/aliases.bash
similarity index 100%
rename from bash/.bash_aliases
rename to bash/.bash/aliases.bash
diff --git a/bash/.bash_functions b/bash/.bash/functions.bash
similarity index 100%
rename from bash/.bash_functions
rename to bash/.bash/functions.bash
diff --git a/bash/.bash_profile b/bash/.bash_profile
index 5755bc3..cdbc26b 100644
--- a/bash/.bash_profile
+++ b/bash/.bash_profile
@@ -38,7 +38,6 @@ if [ $(uname) == "Darwin" ]; then
 	fi
 fi
 
-
 # Go stuff
 if [ -d /usr/local/go ]; then
 	export GOROOT=/usr/local/go/
@@ -46,4 +45,9 @@ if [ -d /usr/local/go ]; then
 	export PATH=$PATH:/usr/local/go/bin:$HOME/go/bin
 fi
 
+# https://github.com/oz/tz
+if [ -f $HOME/go/bin/tz ]; then
+	export TZ_LIST="America/New_York,America/Los_Angeles,Europe/Paris"
+fi
+
 export PS1="\[\e[0;90m\][\[\e[0;37m\]\u\[\e[0;37m\]@\[\e[0;37m\]\H\[\e[0;90m\]] \[\e[0;90m\](\[\e[0;37m\]\W\[\e[0;90m\]) \[\e[0;37m\]\$\[\e[0m\] "
diff --git a/bash/.bashrc b/bash/.bashrc
index ab4d0f6..3afe9ac 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -6,13 +6,13 @@ if [ -f /etc/bashrc ]; then
 fi
 
 # Source functions, if it exists
-if [ -e $HOME/.bash_functions ]; then
-    source $HOME/.bash_functions
+if [ -e $HOME/.bash/functions.bash ]; then
+    source $HOME/.bash/functions.bash
 fi
 
 # Source aliases, if it exists
-if [ -e $HOME/.bash_aliases ]; then
-    source $HOME/.bash_aliases
+if [ -e $$HOME/.bash/aliases.bash ]; then
+    source $HOME/.bash/aliases.bash
 fi
 
 # User specific environment