diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e81ebc8
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+nvim/autoload
+nvim/plugged
diff --git a/alacritty.yml b/alacritty/alacritty.yml
similarity index 100%
rename from alacritty.yml
rename to alacritty/alacritty.yml
diff --git a/bootstrap.sh b/bootstrap.sh
old mode 100644
new mode 100755
index eed36f0..ee14ed9
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,45 +1,29 @@
 #!/bin/bash
 
-createDir() {
-  if [ ! -d "$1"  ] ; then
-    mkdir "$1"
-  fi
-}
-
 # Variables for directories
 nvimDir="$HOME/.config/nvim"
 alacrittyDir="$HOME/.config/alacritty"
 i3Dir="$HOME/.config/i3"
 polybarDir="$HOME/.config/polybar"
 rofiDir="$HOME/.config/rofi"
+picomFile="$HOME/.config/picom.conf"
 
 # Install all configs
 if [ "$1" = "-S" ] ; then
 
 ln -s $PWD/.bashrc $HOME/.bashrc
 
-# Create directories
-createDir $nvimDir
-createDir "$nvimDir/plugged"
-createDir $alacrittyDir
-createDir $i3Dir
-createDir $polybarDir
-createDir $rofiDir
-
-# Link nvim configuration file
-ln -s $PWD/nvim/init.vim $HOME/.config/nvim/init.vim
+# Create symlinks
+ln -s $PWD/nvim $nvimDir
+ln -s $PWD/i3 $i3Dir
+ln -s $PWD/alacritty $alacrittyDir
+ln -s $PWD/polybar $polybarDir
+ln -s $PWD/rofi $rofiDir
+ln -s $PWD/picom.conf $picomFile
 
 # Install vim-plug
 curl -fLo ~/.config/nvim/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
 
-# Create symlinks
-ln -s $PWD/i3_config $HOME/.config/i3/config
-ln -s $PWD/alacritty.yml $HOME/.config/alacritty/alacritty.yml
-ln -s $PWD/polybar/config.ini $HOME/.config/polybar/config
-ln -s $PWD/polybar/launch.sh $HOME/.config/polybar/launch.sh
-ln -s $PWD/rofi_config.rasi $HOME/.config/rofi/config.rasi
-ln -s $PWD/picom.conf $HOME/.config/picom.conf
-
 echo "Install neovim plugins with :PlugInstall command inside neovim"
 
 fi
@@ -47,7 +31,7 @@ fi
 # Remove all configs
 if [ "$1" = "-R" ] ; then
 
-cd && rm -rf .bashrc $nvimDir $alacrittyDir $i3Dir $polybarDir $rofiDir && cd -
+cd && rm -rf .bashrc $nvimDir $alacrittyDir $i3Dir $polybarDir $rofiDir $picomFile && cd -
 
 fi
 
diff --git a/i3_config b/i3/config
similarity index 100%
rename from i3_config
rename to i3/config
diff --git a/polybar/launch.sh b/polybar/launch.sh
index 9f71c92..e012b5c 100755
--- a/polybar/launch.sh
+++ b/polybar/launch.sh
@@ -3,7 +3,7 @@
 # Terminate already running bar instances
 killall -q polybar
 
-polybar main
+polybar main -c $HOME/.config/polybar/config.ini
 
 echo "Bars launched..."
 
diff --git a/rofi_config.rasi b/rofi/rofi_config.rasi
similarity index 100%
rename from rofi_config.rasi
rename to rofi/rofi_config.rasi