diff --git a/.gitignore b/.gitignore
index e81ebc8..cf36ae4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-nvim/autoload
-nvim/plugged
+config/nvim/autoload
+config/nvim/plugged
diff --git a/bootstrap.sh b/bootstrap.sh
index 8560549..2d189b5 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+declare -A configs
+
 usage() {
   echo "usage: (./)bootstrap [-S][-R]"
   echo
@@ -12,21 +14,21 @@ if [ $# -eq 0 ] ; then
   usage
 fi
 
-# Variables for directories
-bashrc="$HOME/.bashrc"
-nvimDir="$HOME/.config/nvim"
-alacrittyDir="$HOME/.config/alacritty"
-i3Dir="$HOME/.config/i3"
-polybarDir="$HOME/.config/polybar"
-swayDir="$HOME/.config/sway"
-waybarDir="$HOME/.config/waybar"
-rofiDir="$HOME/.config/rofi"
-dunstDir="$HOME/.config/dunst"
-fontsDir="$HOME/.config/fontconfig"
-wlogoutDir="$HOME/.config/wlogout"
-picomFile="$HOME/.config/picom.conf"
-gitconfigFile="$HOME/.gitconfig"
-nvimPluggedDir="$HOME/dotfiles/nvim/plugged"
+configs=(
+  ["$PWD/config/.bashrc"]="$HOME/.bashrc"
+  ["$PWD/config/.gitconfig"]="$HOME/.gitconfig"
+  ["$PWD/config/nvim"]="$HOME/.config/nvim"
+  ["$PWD/config/alacritty"]="$HOME/.config/alacritty"
+  ["$PWD/config/i3"]="$HOME/.config/i3"
+  ["$PWD/config/polybar"]="$HOME/.config/polybar"
+  ["$PWD/config/sway"]="$HOME/.config/sway"
+  ["$PWD/config/waybar"]="$HOME/.config/waybar"
+  ["$PWD/config/rofi"]="$HOME/.config/rofi"
+  ["$PWD/config/dunst"]="$HOME/.config/dunst"
+  ["$PWD/config/fonts"]="$HOME/.config/fontconfig"
+  ["$PWD/config/wlogout"]="$HOME/.config/wlogout"
+  ["$PWD/config/picom.conf"]="$HOME/.config/picom.conf"
+)
 
 
 # Install all configs
@@ -34,21 +36,13 @@ if [ "$1" = "-S" ] ; then
 
 
 # Create symlinks
-ln -s $PWD/.bashrc $bashrc
-ln -s $PWD/nvim $nvimDir
-ln -s $PWD/i3 $i3Dir
-ln -s $PWD/alacritty $alacrittyDir
-ln -s $PWD/polybar $polybarDir
-ln -s $PWD/sway $swayDir
-ln -s $PWD/waybar $waybarDir
-ln -s $PWD/rofi $rofiDir
-ln -s $PWD/dunst $dunstDir
-ln -s $PWD/fontconfig $fontsDir
-ln -s $PWD/wlogout $wlogoutDir
-ln -s $PWD/picom.conf $picomFile
-ln -s $PWD/.gitconfig $gitconfigFile
+for config in "${!configs[@]}"
+do
+  ln -s $config ${configs[$config]}
+done
 
 # Install vim-plug
+nvimDir="${configs[$PWD/config/nvim]}"
 mkdir -p $nvimDir/autoload
 wget -O $nvimDir/autoload/plug.vim https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
 
@@ -60,12 +54,11 @@ fi
 # Remove all configs
 if [ "$1" = "-R" ] ; then
 
-cd && rm -rf \
-  $bashrc $nvimDir $alacrittyDir $i3Dir \
-  $polybarDir $swayDir $waybarDir $rofiDir \
-  $dunstDir $fontsDir $picomFile $gitconfigFile \
-  $nvimPluggedDir \
-  && cd -
+cd $HOME
+for config in "${!configs[@]}"
+do
+  rm -rf ${configs[$config]}
+done
 
 fi
 
diff --git a/.bashrc b/config/.bashrc
similarity index 95%
rename from .bashrc
rename to config/.bashrc
index 5a4c278..120fd8d 100644
--- a/.bashrc
+++ b/config/.bashrc
@@ -48,8 +48,9 @@ shopt -s autocd
 
 _GREEN="\[\033[32m\]"
 _BLUE="\[\033[34m\]"
+_BOLD="\[\033[1m\]"
 _RESET="\[\033[0m\]"
-export PS1="${_GREEN}\u@\h${_RESET}:${_BLUE}\W${_RESET} # "
+export PS1="${_GREEN}${_BOLD}\u@\h${_RESET}:${_BLUE}${_BOLD}\W${_RESET} # "
 
 
 #   ____ ___  __  __ ____  _     _____ _____ ___ ___  _   _ 
diff --git a/.gitconfig b/config/.gitconfig
similarity index 100%
rename from .gitconfig
rename to config/.gitconfig
diff --git a/config/alacritty/alacritty b/config/alacritty/alacritty
new file mode 120000
index 0000000..715fb3d
--- /dev/null
+++ b/config/alacritty/alacritty
@@ -0,0 +1 @@
+/home/daniil/dotfiles/config/alacritty
\ No newline at end of file
diff --git a/alacritty/alacritty.yml b/config/alacritty/alacritty.yml
similarity index 100%
rename from alacritty/alacritty.yml
rename to config/alacritty/alacritty.yml
diff --git a/config/dunst/dunst b/config/dunst/dunst
new file mode 120000
index 0000000..e01d33f
--- /dev/null
+++ b/config/dunst/dunst
@@ -0,0 +1 @@
+/home/daniil/dotfiles/config/dunst
\ No newline at end of file
diff --git a/dunst/dunstrc b/config/dunst/dunstrc
similarity index 100%
rename from dunst/dunstrc
rename to config/dunst/dunstrc
diff --git a/config/fontconfig/fonts b/config/fontconfig/fonts
new file mode 120000
index 0000000..b85b7ed
--- /dev/null
+++ b/config/fontconfig/fonts
@@ -0,0 +1 @@
+/home/daniil/dotfiles/config/fonts
\ No newline at end of file
diff --git a/fontconfig/fonts.conf b/config/fontconfig/fonts.conf
similarity index 100%
rename from fontconfig/fonts.conf
rename to config/fontconfig/fonts.conf
diff --git a/i3/config b/config/i3/config
similarity index 100%
rename from i3/config
rename to config/i3/config
diff --git a/config/i3/i3 b/config/i3/i3
new file mode 120000
index 0000000..c7bf3b7
--- /dev/null
+++ b/config/i3/i3
@@ -0,0 +1 @@
+/home/daniil/dotfiles/config/i3
\ No newline at end of file
diff --git a/nvim/coc-settings.json b/config/nvim/coc-settings.json
similarity index 100%
rename from nvim/coc-settings.json
rename to config/nvim/coc-settings.json
diff --git a/nvim/coc.vim b/config/nvim/coc.vim
similarity index 100%
rename from nvim/coc.vim
rename to config/nvim/coc.vim
diff --git a/nvim/file-tree.vim b/config/nvim/file-tree.vim
similarity index 100%
rename from nvim/file-tree.vim
rename to config/nvim/file-tree.vim
diff --git a/nvim/general.vim b/config/nvim/general.vim
similarity index 100%
rename from nvim/general.vim
rename to config/nvim/general.vim
diff --git a/nvim/init.vim b/config/nvim/init.vim
similarity index 75%
rename from nvim/init.vim
rename to config/nvim/init.vim
index cee8c4f..9603b1d 100644
--- a/nvim/init.vim
+++ b/config/nvim/init.vim
@@ -1,11 +1,11 @@
-source $HOME/dotfiles/nvim/plugins.vim
-source $HOME/dotfiles/nvim/general.vim
-source $HOME/dotfiles/nvim/remaps.vim
-source $HOME/dotfiles/nvim/theme.vim
-source $HOME/dotfiles/nvim/terminal.vim
-source $HOME/dotfiles/nvim/file-tree.vim
-source $HOME/dotfiles/nvim/coc.vim
-source $HOME/dotfiles/nvim/tabs.vim
+source $HOME/.config/nvim/plugins.vim
+source $HOME/.config/nvim/general.vim
+source $HOME/.config/nvim/remaps.vim
+source $HOME/.config/nvim/theme.vim
+source $HOME/.config/nvim/terminal.vim
+source $HOME/.config/nvim/file-tree.vim
+source $HOME/.config/nvim/coc.vim
+source $HOME/.config/nvim/tabs.vim
 
 " Filetypes for markdown extension
 let g:mkdp_filetypes = ['md', 'mdx', 'markdown']
diff --git a/config/nvim/nvim b/config/nvim/nvim
new file mode 120000
index 0000000..981ff69
--- /dev/null
+++ b/config/nvim/nvim
@@ -0,0 +1 @@
+/home/daniil/dotfiles/config/nvim
\ No newline at end of file
diff --git a/nvim/plugins.vim b/config/nvim/plugins.vim
similarity index 100%
rename from nvim/plugins.vim
rename to config/nvim/plugins.vim
diff --git a/nvim/remaps.vim b/config/nvim/remaps.vim
similarity index 100%
rename from nvim/remaps.vim
rename to config/nvim/remaps.vim
diff --git a/nvim/tabs.vim b/config/nvim/tabs.vim
similarity index 100%
rename from nvim/tabs.vim
rename to config/nvim/tabs.vim
diff --git a/nvim/terminal.vim b/config/nvim/terminal.vim
similarity index 100%
rename from nvim/terminal.vim
rename to config/nvim/terminal.vim
diff --git a/nvim/theme.vim b/config/nvim/theme.vim
similarity index 100%
rename from nvim/theme.vim
rename to config/nvim/theme.vim
diff --git a/picom.conf b/config/picom.conf
similarity index 100%
rename from picom.conf
rename to config/picom.conf
diff --git a/polybar/config.ini b/config/polybar/config.ini
similarity index 100%
rename from polybar/config.ini
rename to config/polybar/config.ini
diff --git a/polybar/launch.sh b/config/polybar/launch.sh
similarity index 100%
rename from polybar/launch.sh
rename to config/polybar/launch.sh
diff --git a/polybar/logout-window.sh b/config/polybar/logout-window.sh
similarity index 100%
rename from polybar/logout-window.sh
rename to config/polybar/logout-window.sh
diff --git a/config/polybar/polybar b/config/polybar/polybar
new file mode 120000
index 0000000..c9d1aff
--- /dev/null
+++ b/config/polybar/polybar
@@ -0,0 +1 @@
+/home/daniil/dotfiles/config/polybar
\ No newline at end of file
diff --git a/rofi/config.rasi b/config/rofi/config.rasi
similarity index 100%
rename from rofi/config.rasi
rename to config/rofi/config.rasi
diff --git a/config/rofi/rofi b/config/rofi/rofi
new file mode 120000
index 0000000..e30e010
--- /dev/null
+++ b/config/rofi/rofi
@@ -0,0 +1 @@
+/home/daniil/dotfiles/config/rofi
\ No newline at end of file
diff --git a/sway/config b/config/sway/config
similarity index 100%
rename from sway/config
rename to config/sway/config
diff --git a/sway/config.d/50-systemd-user.conf b/config/sway/config.d/50-systemd-user.conf
similarity index 100%
rename from sway/config.d/50-systemd-user.conf
rename to config/sway/config.d/50-systemd-user.conf
diff --git a/config/sway/sway b/config/sway/sway
new file mode 120000
index 0000000..c27f557
--- /dev/null
+++ b/config/sway/sway
@@ -0,0 +1 @@
+/home/daniil/dotfiles/config/sway
\ No newline at end of file
diff --git a/swaylock/config b/config/swaylock/config
similarity index 100%
rename from swaylock/config
rename to config/swaylock/config
diff --git a/waybar/config b/config/waybar/config
similarity index 100%
rename from waybar/config
rename to config/waybar/config
diff --git a/waybar/launch.sh b/config/waybar/launch.sh
similarity index 100%
rename from waybar/launch.sh
rename to config/waybar/launch.sh
diff --git a/waybar/style.css b/config/waybar/style.css
similarity index 100%
rename from waybar/style.css
rename to config/waybar/style.css
diff --git a/config/waybar/waybar b/config/waybar/waybar
new file mode 120000
index 0000000..87bcac8
--- /dev/null
+++ b/config/waybar/waybar
@@ -0,0 +1 @@
+/home/daniil/dotfiles/config/waybar
\ No newline at end of file
diff --git a/wlogout/layout b/config/wlogout/layout
similarity index 100%
rename from wlogout/layout
rename to config/wlogout/layout
diff --git a/wlogout/style.css b/config/wlogout/style.css
similarity index 100%
rename from wlogout/style.css
rename to config/wlogout/style.css
diff --git a/config/wlogout/wlogout b/config/wlogout/wlogout
new file mode 120000
index 0000000..7c9829d
--- /dev/null
+++ b/config/wlogout/wlogout
@@ -0,0 +1 @@
+/home/daniil/dotfiles/config/wlogout
\ No newline at end of file