diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish
index 0606499..636b8f5 100644
--- a/fish/.config/fish/config.fish
+++ b/fish/.config/fish/config.fish
@@ -15,3 +15,6 @@ if command -v composer &> /dev/null
 end
 
 fish_add_path $HOME/.symfony/bin
+
+set fish_function_path (path resolve $__fish_config_dir/functions/*/) $fish_function_path
+set fish_complete_path (path resolve $__fish_config_dir/completions/*/) $fish_complete_path
\ No newline at end of file
diff --git a/fish/.config/fish/functions/f.fish b/fish/.config/fish/functions/custom/f.fish
similarity index 100%
rename from fish/.config/fish/functions/f.fish
rename to fish/.config/fish/functions/custom/f.fish
diff --git a/fish/.config/fish/functions/ll.fish b/fish/.config/fish/functions/custom/ll.fish
similarity index 100%
rename from fish/.config/fish/functions/ll.fish
rename to fish/.config/fish/functions/custom/ll.fish
diff --git a/fish/.config/fish/functions/ls.fish b/fish/.config/fish/functions/custom/ls.fish
similarity index 100%
rename from fish/.config/fish/functions/ls.fish
rename to fish/.config/fish/functions/custom/ls.fish
diff --git a/fish/.config/fish/functions/gcb.fish b/fish/.config/fish/functions/git/gcb.fish
similarity index 100%
rename from fish/.config/fish/functions/gcb.fish
rename to fish/.config/fish/functions/git/gcb.fish
diff --git a/fish/.config/fish/functions/gco.fish b/fish/.config/fish/functions/git/gco.fish
similarity index 100%
rename from fish/.config/fish/functions/gco.fish
rename to fish/.config/fish/functions/git/gco.fish
diff --git a/fish/.config/fish/functions/gl.fish b/fish/.config/fish/functions/git/gl.fish
similarity index 100%
rename from fish/.config/fish/functions/gl.fish
rename to fish/.config/fish/functions/git/gl.fish
diff --git a/fish/.config/fish/functions/gp.fish b/fish/.config/fish/functions/git/gp.fish
similarity index 100%
rename from fish/.config/fish/functions/gp.fish
rename to fish/.config/fish/functions/git/gp.fish
diff --git a/fish/.config/fish/functions/lg.fish b/fish/.config/fish/functions/git/lg.fish
similarity index 100%
rename from fish/.config/fish/functions/lg.fish
rename to fish/.config/fish/functions/git/lg.fish