diff --git a/i3wm/config b/i3wm/config
index b07dc65..491719e 100644
--- a/i3wm/config
+++ b/i3wm/config
@@ -38,9 +38,9 @@ focus_follows_mouse yes
 # 
 
 # Sound softkeys management
-bindsym Print                   exec ~/.i3/volnotid.sh down
-bindsym Scroll_Lock             exec ~/.i3/volnotid.sh up
-bindsym Pause                   exec ~/.i3/volnotid.sh mute
+bindsym Print                   exec ~/.i3/util/volnotid.sh down
+bindsym Scroll_Lock             exec ~/.i3/util/volnotid.sh up
+bindsym Pause                   exec ~/.i3/util/volnotid.sh mute
 
 # Display brightness management
 bindsym XF86MonBrightnessUp     exec "xbacklight +10"
@@ -50,15 +50,15 @@ bindsym XF86MonBrightnessDown   exec "xbacklight -10"
 bindsym XF86Launch1             exec  urxvt -e sh -c "sudo wifi-menu wlp3s0"
 
 # jauth two factor authenticator
-bindsym $mod+F1                 exec ~/.i3/Authenticator.sh google
-bindsym $mod+F2                 exec ~/.i3/Authenticator.sh facebook
-bindsym $mod+F3                 exec ~/.i3/Authenticator.sh dropbox
+bindsym $mod+F1                 exec ~/.i3/util/Authenticator.sh google
+bindsym $mod+F2                 exec ~/.i3/util/Authenticator.sh facebook
+bindsym $mod+F3                 exec ~/.i3/util/Authenticator.sh dropbox
 
 # start dmenu-launcher
-bindsym $mod+d                  exec ~/.i3/i3dmenu-wrapper.sh
+bindsym $mod+d                  exec ~/.i3/util/i3dmenu-wrapper.sh
 
 # lock i3 with i3lock
-bindsym $mod+Shift+x            exec ~/.i3/i3blur.py && systemctl suspend
+bindsym $mod+Shift+x            exec ~/.i3/util/i3blur.py && systemctl suspend
 
 #############################################
 #                  Keymaps                  #
diff --git a/i3wm/Authenticator.sh b/i3wm/util/Authenticator.sh
similarity index 100%
rename from i3wm/Authenticator.sh
rename to i3wm/util/Authenticator.sh
diff --git a/i3wm/i3blur.py b/i3wm/util/i3blur.py
similarity index 100%
rename from i3wm/i3blur.py
rename to i3wm/util/i3blur.py
diff --git a/i3wm/i3dmenu-wrapper.sh b/i3wm/util/i3dmenu-wrapper.sh
similarity index 100%
rename from i3wm/i3dmenu-wrapper.sh
rename to i3wm/util/i3dmenu-wrapper.sh
diff --git a/i3wm/volnotid.sh b/i3wm/util/volnotid.sh
similarity index 100%
rename from i3wm/volnotid.sh
rename to i3wm/util/volnotid.sh
diff --git a/setup.sh b/setup.sh
index 041a609..6cc340c 100755
--- a/setup.sh
+++ b/setup.sh
@@ -10,13 +10,7 @@ git clone https://github.com/id101010/LinuxDotFiles.git $DOTFILES
 
 # setup i3
 if [ ! -e "$HOME/.i3" ]; then
-    cp -r $DOTFILES/i3wm/Authenticator      $HOME/.i3/
-    cp -r $DOTFILES/i3wm/i3blur.py          $HOME/.i3/
-    cp -r $DOTFILES/i3wm/i3dmenu-wrapper.sh $HOME/.i3/
-    cp -r $DOTFILES/i3wm/i3status.conf      $HOME/.i3/
-    cp -r $DOTFILES/i3wm/volnotid.sh        $HOME/.i3/
-    
-    ln -s $DOTFILES/i3wm/config $HOME/.i3/config
+    ln -s $DOTFILES/i3wm/ $HOME/.i3/
 fi
 
 # setup tmux