diff --git a/.zshrc b/.zshrc
index 43e936a..b42bcb2 100644
--- a/.zshrc
+++ b/.zshrc
@@ -36,9 +36,10 @@ elif uname -a | grep -qi '\(arch\|manjaro\)'; then
 fi
 
 # Plugins
-for plugin in `find $DOTFILES/zsh/plugins -type f -iname \*.plugin.zsh -print`; do
-  source $plugin
-done
+#for plugin in `find $DOTFILES/zsh/plugins -type f -iname \*.plugin.zsh -print`; do
+#  source $plugin
+#done
+source $DOTFILES/plugins/*.plugin.zsh
 
 # EDITOR
 export EDITOR="/usr/bin/vim"
@@ -50,6 +51,7 @@ export FZF_DEFAULT_OPTS="--multi --no-mouse --ansi --color=dark"
 [ -f /etc/profile.d/rvm.sh ] && source /etc/profile.d/rvm.sh
 
 # Loading additional aliases
-for aliases in `find $DOTFILES/zsh/aliases -type f -iname \*.aliases.zsh`; do
-  source $aliases
-done
+#for aliases in `find $DOTFILES/zsh/aliases -type f -iname \*.aliases.zsh -print`; do
+#  source $aliases
+#done
+source $DOTFILES/aliases/*.aliases.zsh