diff --git a/.config/shell/zshrc.d/6-l-calls-k.zsh b/.config/shell/rc.d/alias-l.sh
similarity index 100%
rename from .config/shell/zshrc.d/6-l-calls-k.zsh
rename to .config/shell/rc.d/alias-l.sh
diff --git a/.config/shell/zshrc.d/6-base.zsh b/.config/shell/rc.d/base-aliases.sh
similarity index 100%
rename from .config/shell/zshrc.d/6-base.zsh
rename to .config/shell/rc.d/base-aliases.sh
diff --git a/.config/shell/zshrc.d/0-dotfiles-version-control-commands.zsh b/.config/shell/rc.d/dotfiles-version-control-commands.sh
similarity index 99%
rename from .config/shell/zshrc.d/0-dotfiles-version-control-commands.zsh
rename to .config/shell/rc.d/dotfiles-version-control-commands.sh
index af51369..e3c6852 100644
--- a/.config/shell/zshrc.d/0-dotfiles-version-control-commands.zsh
+++ b/.config/shell/rc.d/dotfiles-version-control-commands.sh
@@ -10,7 +10,7 @@ alias dot='/usr/bin/git --git-dir=/home/marty/.dotfiles/ --work-tree=/home/marty
 #
 # This means you can safely remove the README.md file from your home dir
 # without git trying to delete it from the repository.
-# If you WANT to make changes to the README.md, you will have to make git 
+# If you WANT to make changes to the README.md, you will have to make git
 # watch it again with the commented out command
 #
 # Read more: https://stackoverflow.com/questions/4308610/how-to-ignore-certain-files-in-git
diff --git a/.config/shell/zshrc.d/6-nvim-to-vim-if-installed.zsh b/.config/shell/rc.d/nvim-to-vim.sh
similarity index 100%
rename from .config/shell/zshrc.d/6-nvim-to-vim-if-installed.zsh
rename to .config/shell/rc.d/nvim-to-vim.sh
diff --git a/.config/shell/zshrc.d/0-set-locale-to-us-utf8.zsh b/.config/shell/rc.d/set-locale-to-us-utf8.sh
similarity index 100%
rename from .config/shell/zshrc.d/0-set-locale-to-us-utf8.zsh
rename to .config/shell/rc.d/set-locale-to-us-utf8.sh
diff --git a/.config/shell/zshrc.d/1-ssh-agent-autoconfiguration.zsh b/.config/shell/rc.d/ssh-agent-autoconfiguration.sh
similarity index 100%
rename from .config/shell/zshrc.d/1-ssh-agent-autoconfiguration.zsh
rename to .config/shell/rc.d/ssh-agent-autoconfiguration.sh
diff --git a/.config/shell/zshrc.d/3-configure-autocompletion.zsh b/.config/shell/zshrc.d/9-configure-autocompletion.zsh
similarity index 100%
rename from .config/shell/zshrc.d/3-configure-autocompletion.zsh
rename to .config/shell/zshrc.d/9-configure-autocompletion.zsh
diff --git a/.config/shell/zshrc.d/3-disable-enhancd-dot-dot-behavior.zsh b/.config/shell/zshrc.d/9-disable-enhancd-dot-dot-behavior.zsh
similarity index 75%
rename from .config/shell/zshrc.d/3-disable-enhancd-dot-dot-behavior.zsh
rename to .config/shell/zshrc.d/9-disable-enhancd-dot-dot-behavior.zsh
index 0c33913..8ee2725 100644
--- a/.config/shell/zshrc.d/3-disable-enhancd-dot-dot-behavior.zsh
+++ b/.config/shell/zshrc.d/9-disable-enhancd-dot-dot-behavior.zsh
@@ -1,4 +1,4 @@
 # Assumes enhancd is installed (via plugin)
 # Let's you go back a directory with .. (usual cd .. behavior)
 # Let's the enhancd backtrack menu appear with cd .. (usual enhancd behavior)
-alias ..="ENHANCD_DISABLE_DOT=1 cd .."
\ No newline at end of file
+alias ..="ENHANCD_DISABLE_DOT=1 cd .. ENHANCD_DISABLE_DOT=0"
diff --git a/.config/shell/zshrc.d/20-essential.zsh b/.config/shell/zshrc.d/plugins.zsh
similarity index 100%
rename from .config/shell/zshrc.d/20-essential.zsh
rename to .config/shell/zshrc.d/plugins.zsh