diff --git a/fish_mode_prompt.fish b/functions/fish_mode_prompt.fish
similarity index 100%
rename from fish_mode_prompt.fish
rename to functions/fish_mode_prompt.fish
diff --git a/fish_prompt.fish b/functions/fish_prompt.fish
similarity index 100%
rename from fish_prompt.fish
rename to functions/fish_prompt.fish
diff --git a/fish_right_prompt.fish b/functions/fish_right_prompt.fish
similarity index 100%
rename from fish_right_prompt.fish
rename to functions/fish_right_prompt.fish
diff --git a/git_ahead.fish b/functions/git_ahead.fish
similarity index 100%
rename from git_ahead.fish
rename to functions/git_ahead.fish
diff --git a/git_branch_name.fish b/functions/git_branch_name.fish
similarity index 100%
rename from git_branch_name.fish
rename to functions/git_branch_name.fish
diff --git a/git_is_detached_head.fish b/functions/git_is_detached_head.fish
similarity index 100%
rename from git_is_detached_head.fish
rename to functions/git_is_detached_head.fish
diff --git a/git_is_dirty.fish b/functions/git_is_dirty.fish
similarity index 100%
rename from git_is_dirty.fish
rename to functions/git_is_dirty.fish
diff --git a/git_is_empty.fish b/functions/git_is_empty.fish
similarity index 100%
rename from git_is_empty.fish
rename to functions/git_is_empty.fish
diff --git a/git_is_repo.fish b/functions/git_is_repo.fish
similarity index 100%
rename from git_is_repo.fish
rename to functions/git_is_repo.fish
diff --git a/git_is_staged.fish b/functions/git_is_staged.fish
similarity index 100%
rename from git_is_staged.fish
rename to functions/git_is_staged.fish
diff --git a/git_is_stashed.fish b/functions/git_is_stashed.fish
similarity index 100%
rename from git_is_stashed.fish
rename to functions/git_is_stashed.fish
diff --git a/git_is_tag.fish b/functions/git_is_tag.fish
similarity index 100%
rename from git_is_tag.fish
rename to functions/git_is_tag.fish
diff --git a/git_is_touched.fish b/functions/git_is_touched.fish
similarity index 100%
rename from git_is_touched.fish
rename to functions/git_is_touched.fish
diff --git a/git_repository_root.fish b/functions/git_repository_root.fish
similarity index 100%
rename from git_repository_root.fish
rename to functions/git_repository_root.fish
diff --git a/git_untracked_files.fish b/functions/git_untracked_files.fish
similarity index 100%
rename from git_untracked_files.fish
rename to functions/git_untracked_files.fish
diff --git a/host_info.fish b/functions/host_info.fish
similarity index 100%
rename from host_info.fish
rename to functions/host_info.fish
diff --git a/humanize_duration.fish b/functions/humanize_duration.fish
similarity index 100%
rename from humanize_duration.fish
rename to functions/humanize_duration.fish
diff --git a/last_job_id.fish b/functions/last_job_id.fish
similarity index 100%
rename from last_job_id.fish
rename to functions/last_job_id.fish
diff --git a/pwd_info.fish b/functions/pwd_info.fish
similarity index 100%
rename from pwd_info.fish
rename to functions/pwd_info.fish
diff --git a/pwd_is_home.fish b/functions/pwd_is_home.fish
similarity index 100%
rename from pwd_is_home.fish
rename to functions/pwd_is_home.fish
diff --git a/segment.fish b/functions/segment.fish
similarity index 100%
rename from segment.fish
rename to functions/segment.fish
diff --git a/segment_close.fish b/functions/segment_close.fish
similarity index 100%
rename from segment_close.fish
rename to functions/segment_close.fish
diff --git a/segment_right.fish b/functions/segment_right.fish
similarity index 100%
rename from segment_right.fish
rename to functions/segment_right.fish
diff --git a/set_color_custom.fish b/functions/set_color_custom.fish
similarity index 100%
rename from set_color_custom.fish
rename to functions/set_color_custom.fish