diff --git a/.gitignore b/.gitignore
index 712aa27..7c69214 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 *~
-config/fish/fish_variables
+fish/fish_variables
 vim/.netrwhist
diff --git a/create_symlinks.sh b/create_symlinks.sh
index eeee17a..1a9ae4e 100755
--- a/create_symlinks.sh
+++ b/create_symlinks.sh
@@ -22,8 +22,8 @@ if which vim >/dev/null 2>&1; then
 	link_file vim .vim
 	link_file vimrc .vimrc
 fi
-which fish >/dev/null 2>&1 && link_file config/fish .config/fish ../
-which youtube-dl >/dev/null 2>&1 && link_file config/youtube-dl .config/youtube-dl ../
+which fish >/dev/null 2>&1 && link_file fish .config/fish ../
+which youtube-dl >/dev/null 2>&1 && link_file youtube-dl .config/youtube-dl ../
 which zsh >/dev/null 2>&1 && link_file zshrc .zshrc
 
 if test x"$(uname -s)" = x"Darwin"; then
diff --git a/config/fish/completions/pkg_delete.fish b/fish/completions/pkg_delete.fish
similarity index 100%
rename from config/fish/completions/pkg_delete.fish
rename to fish/completions/pkg_delete.fish
diff --git a/config/fish/completions/pkg_info.fish b/fish/completions/pkg_info.fish
similarity index 100%
rename from config/fish/completions/pkg_info.fish
rename to fish/completions/pkg_info.fish
diff --git a/config/fish/completions/run.fish b/fish/completions/run.fish
similarity index 100%
rename from config/fish/completions/run.fish
rename to fish/completions/run.fish
diff --git a/config/fish/config.fish b/fish/config.fish
similarity index 100%
rename from config/fish/config.fish
rename to fish/config.fish
diff --git a/config/fish/functions/cd.fish b/fish/functions/cd.fish
similarity index 100%
rename from config/fish/functions/cd.fish
rename to fish/functions/cd.fish
diff --git a/config/fish/functions/cross.fish b/fish/functions/cross.fish
similarity index 100%
rename from config/fish/functions/cross.fish
rename to fish/functions/cross.fish
diff --git a/config/fish/functions/eps.fish b/fish/functions/eps.fish
similarity index 100%
rename from config/fish/functions/eps.fish
rename to fish/functions/eps.fish
diff --git a/config/fish/functions/fgrep.fish b/fish/functions/fgrep.fish
similarity index 100%
rename from config/fish/functions/fgrep.fish
rename to fish/functions/fgrep.fish
diff --git a/config/fish/functions/fish_prompt.fish b/fish/functions/fish_prompt.fish
similarity index 100%
rename from config/fish/functions/fish_prompt.fish
rename to fish/functions/fish_prompt.fish
diff --git a/config/fish/functions/fish_right_prompt.fish b/fish/functions/fish_right_prompt.fish
similarity index 100%
rename from config/fish/functions/fish_right_prompt.fish
rename to fish/functions/fish_right_prompt.fish
diff --git a/config/fish/functions/fish_title.fish b/fish/functions/fish_title.fish
similarity index 100%
rename from config/fish/functions/fish_title.fish
rename to fish/functions/fish_title.fish
diff --git a/config/fish/functions/gpg-sftp.fish b/fish/functions/gpg-sftp.fish
similarity index 100%
rename from config/fish/functions/gpg-sftp.fish
rename to fish/functions/gpg-sftp.fish
diff --git a/config/fish/functions/gpg-ssh-add.fish b/fish/functions/gpg-ssh-add.fish
similarity index 100%
rename from config/fish/functions/gpg-ssh-add.fish
rename to fish/functions/gpg-ssh-add.fish
diff --git a/config/fish/functions/gpg-ssh.fish b/fish/functions/gpg-ssh.fish
similarity index 100%
rename from config/fish/functions/gpg-ssh.fish
rename to fish/functions/gpg-ssh.fish
diff --git a/config/fish/functions/grep.fish b/fish/functions/grep.fish
similarity index 100%
rename from config/fish/functions/grep.fish
rename to fish/functions/grep.fish
diff --git a/config/fish/functions/ixio.fish b/fish/functions/ixio.fish
similarity index 100%
rename from config/fish/functions/ixio.fish
rename to fish/functions/ixio.fish
diff --git a/config/fish/functions/ls.fish b/fish/functions/ls.fish
similarity index 100%
rename from config/fish/functions/ls.fish
rename to fish/functions/ls.fish
diff --git a/config/fish/functions/make.fish b/fish/functions/make.fish
similarity index 100%
rename from config/fish/functions/make.fish
rename to fish/functions/make.fish
diff --git a/config/fish/functions/mpv.fish b/fish/functions/mpv.fish
similarity index 100%
rename from config/fish/functions/mpv.fish
rename to fish/functions/mpv.fish
diff --git a/config/fish/functions/pkg_chk.fish b/fish/functions/pkg_chk.fish
similarity index 100%
rename from config/fish/functions/pkg_chk.fish
rename to fish/functions/pkg_chk.fish
diff --git a/config/fish/functions/pkg_rolling-replace.fish b/fish/functions/pkg_rolling-replace.fish
similarity index 100%
rename from config/fish/functions/pkg_rolling-replace.fish
rename to fish/functions/pkg_rolling-replace.fish
diff --git a/config/fish/functions/prompt_pwd.fish b/fish/functions/prompt_pwd.fish
similarity index 100%
rename from config/fish/functions/prompt_pwd.fish
rename to fish/functions/prompt_pwd.fish
diff --git a/config/fish/functions/pw.fish b/fish/functions/pw.fish
similarity index 100%
rename from config/fish/functions/pw.fish
rename to fish/functions/pw.fish
diff --git a/config/fish/functions/pws.fish b/fish/functions/pws.fish
similarity index 100%
rename from config/fish/functions/pws.fish
rename to fish/functions/pws.fish
diff --git a/config/fish/functions/run.fish b/fish/functions/run.fish
similarity index 100%
rename from config/fish/functions/run.fish
rename to fish/functions/run.fish
diff --git a/config/fish/functions/url2pkg.fish b/fish/functions/url2pkg.fish
similarity index 100%
rename from config/fish/functions/url2pkg.fish
rename to fish/functions/url2pkg.fish
diff --git a/config/youtube-dl/config b/youtube-dl/config
similarity index 100%
rename from config/youtube-dl/config
rename to youtube-dl/config