diff --git a/.config/shell/aliasrc b/.config/shell/aliases/common
similarity index 100%
rename from .config/shell/aliasrc
rename to .config/shell/aliases/common
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index 13df061..74c8106 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -147,4 +147,7 @@ bindkey '^[[B' history-substring-search-down
 
 RPROMPT='$(git_prompt_string)'
 [ -f "$ZDOTDIR/completion" ] && . "$ZDOTDIR/completion" # Additional ZSH completion
-[ -f "${XDG_CONFIG_HOME:-$HOME/.config}/shell/aliasrc" ] && . "${XDG_CONFIG_HOME:-$HOME/.config}/shell/aliasrc"
+
+find "${XDG_CONFIG_HOME:-$HOME/.config}/shell/aliases" -type f | while read -r alias_file; do
+    source "$alias_file"
+done