diff --git a/zsh/plugins/antigen.plugin.zsh b/zsh/antigen.zsh
similarity index 100%
rename from zsh/plugins/antigen.plugin.zsh
rename to zsh/antigen.zsh
diff --git a/zshrc b/zshrc
index 5e740e6..28782a5 100644
--- a/zshrc
+++ b/zshrc
@@ -13,29 +13,8 @@ compinit
 # zsh packages from system
 source ${DOTFILES}/zsh/distro.base.zsh
 
-# Plugins
-for plugin in `find $DOTFILES/zsh/plugins -iname \*.plugin.zsh -print`; do
-  if [ -f /etc/redhat-release ]; then
-    if [ "$(basename ${plugin})" != 'fzf.plugin.zsh' ]; then
-      source $plugin
-    fi
-  else
-    source $plugin
-  fi
-done
-
-for plugin in `find $DOTFILES/zsh/plugins -iname \*.plugin.zsh -print`; do
-  if [ -f /etc/redhat-release ]; then
-    if [ "$(basename ${plugin})" != 'fzf.plugin.zsh' ]; then
-      source $plugin
-    fi
-  else
-    source $plugin
-  fi
-done
-
-# Antigen configuration
-# the main pluing should have been sourced in the previous loop.
+# Antigen config
+source ${DOTFILES}/zsh/antigen.zsh
 antigen bundle command-not-found
 antigen bundle common-aliases
 antigen bundle copyfile
@@ -52,13 +31,26 @@ antigen bundle z
 antigen bundle sunlei/zsh-ssh
 antigen apply
 
-# EDITOR
-export EDITOR="/usr/bin/vim"
+# configuring fzf plugin for tmux
 export ZSH_TMUX_CONFIG=${HOME}/.config/tmux/tmux.conf
 
 # FZF default options
 [ -x `which fzf 2>/dev/null` ] && export FZF_DEFAULT_OPTS="--multi --no-mouse --ansi --color=dark"
 
+# Other plugins
+for plugin in `find $DOTFILES/zsh/plugins -iname \*.plugin.zsh -print`; do
+  if [ -f /etc/redhat-release ]; then
+    if [ "$(basename ${plugin})" != 'fzf.plugin.zsh' ]; then
+      source $plugin
+    fi
+  else
+    source $plugin
+  fi
+done
+
+# EDITOR
+export EDITOR="/usr/bin/vim"
+
 # Loading additional aliases
 for file in `find $DOTFILES/zsh/aliases -iname \*.aliases.zsh -print`; do
   source $file