diff --git a/configs/shell/zsh/.zshlogin b/configs/shell/zsh/.zlogin
similarity index 100%
rename from configs/shell/zsh/.zshlogin
rename to configs/shell/zsh/.zlogin
diff --git a/configs/shell/zsh/.zsh/aliases/dir.zsh b/configs/shell/zsh/.zsh/aliases/helpers/dir.zsh
similarity index 100%
rename from configs/shell/zsh/.zsh/aliases/dir.zsh
rename to configs/shell/zsh/.zsh/aliases/helpers/dir.zsh
diff --git a/configs/shell/zsh/.zsh/aliases/git.zsh b/configs/shell/zsh/.zsh/aliases/helpers/git.zsh
similarity index 100%
rename from configs/shell/zsh/.zsh/aliases/git.zsh
rename to configs/shell/zsh/.zsh/aliases/helpers/git.zsh
diff --git a/configs/shell/zsh/.zsh/aliases/nmcli.zsh b/configs/shell/zsh/.zsh/aliases/helpers/nmcli.zsh
similarity index 100%
rename from configs/shell/zsh/.zsh/aliases/nmcli.zsh
rename to configs/shell/zsh/.zsh/aliases/helpers/nmcli.zsh
diff --git a/configs/shell/zsh/.zsh/aliases/main.zsh b/configs/shell/zsh/.zsh/aliases/main.zsh
index ee9e9c8..591326f 100644
--- a/configs/shell/zsh/.zsh/aliases/main.zsh
+++ b/configs/shell/zsh/.zsh/aliases/main.zsh
@@ -1,6 +1,6 @@
-source ~/.zsh/aliases/dir.zsh
-source ~/.zsh/aliases/git.zsh
-source ~/.zsh/aliases/nmcli.zsh
+source ~/.zsh/aliases/helpers/dir.zsh
+source ~/.zsh/aliases/helpers/git.zsh
+source ~/.zsh/aliases/helpers/nmcli.zsh
 
 alias fclean="flatpak uninstall --unused --delete-data"
 alias fdir="cd $HOME/.var/app && ls"
diff --git a/configs/shell/zsh/.zsh/functions/helpers.zsh b/configs/shell/zsh/.zsh/functions/helpers/validate.zsh
similarity index 100%
rename from configs/shell/zsh/.zsh/functions/helpers.zsh
rename to configs/shell/zsh/.zsh/functions/helpers/validate.zsh
diff --git a/configs/shell/zsh/.zsh/functions/main.zsh b/configs/shell/zsh/.zsh/functions/main.zsh
index 3b70a3a..8dbcae7 100644
--- a/configs/shell/zsh/.zsh/functions/main.zsh
+++ b/configs/shell/zsh/.zsh/functions/main.zsh
@@ -1,4 +1,4 @@
-source ~/.zsh/functions/helpers.zsh
+source ~/.zsh/functions/helpers/validate.zsh
 
 convert_video_to_gif() {
     local fps=60
diff --git a/configs/shell/zsh/.zshrc b/configs/shell/zsh/.zshrc
index e4e5c41..523d6a8 100644
--- a/configs/shell/zsh/.zshrc
+++ b/configs/shell/zsh/.zshrc
@@ -1,8 +1,5 @@
 # shell to zsh : chsh -s $(which zsh)
 
-source ~/.zshlogin
-source ~/.zshenv
-
 ZSH_THEME="nebirhos"
 # zsh-syntax-highlighting: https://github.com/zsh-users/zsh-syntax-highlighting/blob/master/INSTALL.md
 # zsh-autosuggestions: https://github.com/zsh-users/zsh-autosuggestions/blob/master/INSTALL.md