diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 5be3e4921..780cb7281 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -266,7 +266,7 @@ regressions in the future (i.e., we don’t reintroduce the bug).
 
 The tests can be found in three places:
 
-- fish-rust/src/tests for unit tests.
+- src/tests for unit tests.
 - tests/checks for script tests, run by `littlecheck <https://github.com/ridiculousfish/littlecheck>`__
 - tests/pexpects for interactive tests using `pexpect <https://pexpect.readthedocs.io/en/stable/>`__
 
diff --git a/Cargo.toml b/Cargo.toml
index baf9e18f1..b1b68749f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,15 +1,13 @@
 [workspace]
 resolver = "2"
 members = [
-    "fish-rust/widestring-suffix",
+    "widestring-suffix",
 ]
 
 [workspace.package]
 rust-version = "1.67"
 edition = "2021"
 
-# TODO: Move fish-rust to src, make it the root package of this workspace
-
 [profile.release]
 overflow-checks = true
 
@@ -18,10 +16,9 @@ name = "fish"
 version = "0.1.0"
 edition.workspace = true
 rust-version.workspace = true
-build = "fish-rust/build.rs"
 
 [dependencies]
-widestring-suffix = { path = "fish-rust/widestring-suffix/" }
+widestring-suffix = { path = "widestring-suffix/" }
 pcre2 = { git = "https://github.com/fish-shell/rust-pcre2", branch = "master", default-features = false, features = ["utf32"] }
 fast-float = { git = "https://github.com/fish-shell/fast-float-rust", branch="fish" }
 hexponent = { git = "https://github.com/fish-shell/hexponent", branch="fish" }
@@ -51,19 +48,19 @@ rsconf = "0.1.1"
 
 [lib]
 crate-type = ["rlib"]
-path = "fish-rust/src/lib.rs"
+path = "src/lib.rs"
 
 [[bin]]
 name = "fish"
-path = "fish-rust/src/bin/fish.rs"
+path = "src/bin/fish.rs"
 
 [[bin]]
 name = "fish_indent"
-path = "fish-rust/src/bin/fish_indent.rs"
+path = "src/bin/fish_indent.rs"
 
 [[bin]]
 name = "fish_key_reader"
-path = "fish-rust/src/bin/fish_key_reader.rs"
+path = "src/bin/fish_key_reader.rs"
 
 [features]
 default = []
diff --git a/fish-rust/build.rs b/build.rs
similarity index 96%
rename from fish-rust/build.rs
rename to build.rs
index 885fb94f6..48d602876 100644
--- a/fish-rust/build.rs
+++ b/build.rs
@@ -51,20 +51,20 @@ fn main() {
     rsconf::link_libraries(&curses_libnames, LinkType::Default);
 
     cc::Build::new()
-        .file("fish-rust/src/libc.c")
+        .file("src/libc.c")
         .include(&build_dir)
         .compile("flibc.a");
 
-    if compiles("fish-rust/src/cfg/w_exitcode.cpp") {
+    if compiles("src/cfg/w_exitcode.cpp") {
         println!("cargo:rustc-cfg=HAVE_WAITSTATUS_SIGNAL_RET");
     }
-    if compiles("fish-rust/src/cfg/eventfd.c") {
+    if compiles("src/cfg/eventfd.c") {
         println!("cargo:rustc-cfg=HAVE_EVENTFD");
     }
-    if compiles("fish-rust/src/cfg/pipe2.c") {
+    if compiles("src/cfg/pipe2.c") {
         println!("cargo:rustc-cfg=HAVE_PIPE2");
     }
-    if compiles("fish-rust/src/cfg/spawn.c") {
+    if compiles("src/cfg/spawn.c") {
         println!("cargo:rustc-cfg=FISH_USE_POSIX_SPAWN");
     }
 
diff --git a/debian/copyright b/debian/copyright
index 6839be698..92e254803 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -25,7 +25,7 @@ Files: share/tools/web_config/themes/Dracula.theme
 Copyright: 2018 Dracula Team
 License: MIT
 
-Files: fish-rust/src/builtins/printf.rs
+Files: src/builtins/printf.rs
 Copyright: 1990-2007 Free Software Foundation, Inc.
            2022 fish-shell contributors
 License: GPL-2+
diff --git a/fish-rust/src/abbrs.rs b/src/abbrs.rs
similarity index 100%
rename from fish-rust/src/abbrs.rs
rename to src/abbrs.rs
diff --git a/fish-rust/src/ast.rs b/src/ast.rs
similarity index 100%
rename from fish-rust/src/ast.rs
rename to src/ast.rs
diff --git a/fish-rust/src/autoload.rs b/src/autoload.rs
similarity index 100%
rename from fish-rust/src/autoload.rs
rename to src/autoload.rs
diff --git a/fish-rust/src/bin/fish.rs b/src/bin/fish.rs
similarity index 100%
rename from fish-rust/src/bin/fish.rs
rename to src/bin/fish.rs
diff --git a/fish-rust/src/bin/fish_indent.rs b/src/bin/fish_indent.rs
similarity index 100%
rename from fish-rust/src/bin/fish_indent.rs
rename to src/bin/fish_indent.rs
diff --git a/fish-rust/src/bin/fish_key_reader.rs b/src/bin/fish_key_reader.rs
similarity index 100%
rename from fish-rust/src/bin/fish_key_reader.rs
rename to src/bin/fish_key_reader.rs
diff --git a/fish-rust/src/builtins/abbr.rs b/src/builtins/abbr.rs
similarity index 100%
rename from fish-rust/src/builtins/abbr.rs
rename to src/builtins/abbr.rs
diff --git a/fish-rust/src/builtins/argparse.rs b/src/builtins/argparse.rs
similarity index 100%
rename from fish-rust/src/builtins/argparse.rs
rename to src/builtins/argparse.rs
diff --git a/fish-rust/src/builtins/bg.rs b/src/builtins/bg.rs
similarity index 100%
rename from fish-rust/src/builtins/bg.rs
rename to src/builtins/bg.rs
diff --git a/fish-rust/src/builtins/bind.rs b/src/builtins/bind.rs
similarity index 100%
rename from fish-rust/src/builtins/bind.rs
rename to src/builtins/bind.rs
diff --git a/fish-rust/src/builtins/block.rs b/src/builtins/block.rs
similarity index 100%
rename from fish-rust/src/builtins/block.rs
rename to src/builtins/block.rs
diff --git a/fish-rust/src/builtins/builtin.rs b/src/builtins/builtin.rs
similarity index 100%
rename from fish-rust/src/builtins/builtin.rs
rename to src/builtins/builtin.rs
diff --git a/fish-rust/src/builtins/cd.rs b/src/builtins/cd.rs
similarity index 100%
rename from fish-rust/src/builtins/cd.rs
rename to src/builtins/cd.rs
diff --git a/fish-rust/src/builtins/command.rs b/src/builtins/command.rs
similarity index 100%
rename from fish-rust/src/builtins/command.rs
rename to src/builtins/command.rs
diff --git a/fish-rust/src/builtins/commandline.rs b/src/builtins/commandline.rs
similarity index 100%
rename from fish-rust/src/builtins/commandline.rs
rename to src/builtins/commandline.rs
diff --git a/fish-rust/src/builtins/complete.rs b/src/builtins/complete.rs
similarity index 100%
rename from fish-rust/src/builtins/complete.rs
rename to src/builtins/complete.rs
diff --git a/fish-rust/src/builtins/contains.rs b/src/builtins/contains.rs
similarity index 100%
rename from fish-rust/src/builtins/contains.rs
rename to src/builtins/contains.rs
diff --git a/fish-rust/src/builtins/count.rs b/src/builtins/count.rs
similarity index 100%
rename from fish-rust/src/builtins/count.rs
rename to src/builtins/count.rs
diff --git a/fish-rust/src/builtins/disown.rs b/src/builtins/disown.rs
similarity index 100%
rename from fish-rust/src/builtins/disown.rs
rename to src/builtins/disown.rs
diff --git a/fish-rust/src/builtins/echo.rs b/src/builtins/echo.rs
similarity index 100%
rename from fish-rust/src/builtins/echo.rs
rename to src/builtins/echo.rs
diff --git a/fish-rust/src/builtins/emit.rs b/src/builtins/emit.rs
similarity index 100%
rename from fish-rust/src/builtins/emit.rs
rename to src/builtins/emit.rs
diff --git a/fish-rust/src/builtins/eval.rs b/src/builtins/eval.rs
similarity index 100%
rename from fish-rust/src/builtins/eval.rs
rename to src/builtins/eval.rs
diff --git a/fish-rust/src/builtins/exit.rs b/src/builtins/exit.rs
similarity index 100%
rename from fish-rust/src/builtins/exit.rs
rename to src/builtins/exit.rs
diff --git a/fish-rust/src/builtins/fg.rs b/src/builtins/fg.rs
similarity index 100%
rename from fish-rust/src/builtins/fg.rs
rename to src/builtins/fg.rs
diff --git a/fish-rust/src/builtins/function.rs b/src/builtins/function.rs
similarity index 100%
rename from fish-rust/src/builtins/function.rs
rename to src/builtins/function.rs
diff --git a/fish-rust/src/builtins/functions.rs b/src/builtins/functions.rs
similarity index 100%
rename from fish-rust/src/builtins/functions.rs
rename to src/builtins/functions.rs
diff --git a/fish-rust/src/builtins/history.rs b/src/builtins/history.rs
similarity index 100%
rename from fish-rust/src/builtins/history.rs
rename to src/builtins/history.rs
diff --git a/fish-rust/src/builtins/jobs.rs b/src/builtins/jobs.rs
similarity index 100%
rename from fish-rust/src/builtins/jobs.rs
rename to src/builtins/jobs.rs
diff --git a/fish-rust/src/builtins/math.rs b/src/builtins/math.rs
similarity index 100%
rename from fish-rust/src/builtins/math.rs
rename to src/builtins/math.rs
diff --git a/fish-rust/src/builtins/mod.rs b/src/builtins/mod.rs
similarity index 100%
rename from fish-rust/src/builtins/mod.rs
rename to src/builtins/mod.rs
diff --git a/fish-rust/src/builtins/path.rs b/src/builtins/path.rs
similarity index 100%
rename from fish-rust/src/builtins/path.rs
rename to src/builtins/path.rs
diff --git a/fish-rust/src/builtins/printf.rs b/src/builtins/printf.rs
similarity index 100%
rename from fish-rust/src/builtins/printf.rs
rename to src/builtins/printf.rs
diff --git a/fish-rust/src/builtins/pwd.rs b/src/builtins/pwd.rs
similarity index 100%
rename from fish-rust/src/builtins/pwd.rs
rename to src/builtins/pwd.rs
diff --git a/fish-rust/src/builtins/random.rs b/src/builtins/random.rs
similarity index 100%
rename from fish-rust/src/builtins/random.rs
rename to src/builtins/random.rs
diff --git a/fish-rust/src/builtins/read.rs b/src/builtins/read.rs
similarity index 100%
rename from fish-rust/src/builtins/read.rs
rename to src/builtins/read.rs
diff --git a/fish-rust/src/builtins/realpath.rs b/src/builtins/realpath.rs
similarity index 100%
rename from fish-rust/src/builtins/realpath.rs
rename to src/builtins/realpath.rs
diff --git a/fish-rust/src/builtins/return.rs b/src/builtins/return.rs
similarity index 100%
rename from fish-rust/src/builtins/return.rs
rename to src/builtins/return.rs
diff --git a/fish-rust/src/builtins/set.rs b/src/builtins/set.rs
similarity index 100%
rename from fish-rust/src/builtins/set.rs
rename to src/builtins/set.rs
diff --git a/fish-rust/src/builtins/set_color.rs b/src/builtins/set_color.rs
similarity index 100%
rename from fish-rust/src/builtins/set_color.rs
rename to src/builtins/set_color.rs
diff --git a/fish-rust/src/builtins/shared.rs b/src/builtins/shared.rs
similarity index 100%
rename from fish-rust/src/builtins/shared.rs
rename to src/builtins/shared.rs
diff --git a/fish-rust/src/builtins/source.rs b/src/builtins/source.rs
similarity index 100%
rename from fish-rust/src/builtins/source.rs
rename to src/builtins/source.rs
diff --git a/fish-rust/src/builtins/status.rs b/src/builtins/status.rs
similarity index 100%
rename from fish-rust/src/builtins/status.rs
rename to src/builtins/status.rs
diff --git a/fish-rust/src/builtins/string.rs b/src/builtins/string.rs
similarity index 100%
rename from fish-rust/src/builtins/string.rs
rename to src/builtins/string.rs
diff --git a/fish-rust/src/builtins/string/collect.rs b/src/builtins/string/collect.rs
similarity index 100%
rename from fish-rust/src/builtins/string/collect.rs
rename to src/builtins/string/collect.rs
diff --git a/fish-rust/src/builtins/string/escape.rs b/src/builtins/string/escape.rs
similarity index 100%
rename from fish-rust/src/builtins/string/escape.rs
rename to src/builtins/string/escape.rs
diff --git a/fish-rust/src/builtins/string/join.rs b/src/builtins/string/join.rs
similarity index 100%
rename from fish-rust/src/builtins/string/join.rs
rename to src/builtins/string/join.rs
diff --git a/fish-rust/src/builtins/string/length.rs b/src/builtins/string/length.rs
similarity index 100%
rename from fish-rust/src/builtins/string/length.rs
rename to src/builtins/string/length.rs
diff --git a/fish-rust/src/builtins/string/match.rs b/src/builtins/string/match.rs
similarity index 100%
rename from fish-rust/src/builtins/string/match.rs
rename to src/builtins/string/match.rs
diff --git a/fish-rust/src/builtins/string/pad.rs b/src/builtins/string/pad.rs
similarity index 100%
rename from fish-rust/src/builtins/string/pad.rs
rename to src/builtins/string/pad.rs
diff --git a/fish-rust/src/builtins/string/repeat.rs b/src/builtins/string/repeat.rs
similarity index 100%
rename from fish-rust/src/builtins/string/repeat.rs
rename to src/builtins/string/repeat.rs
diff --git a/fish-rust/src/builtins/string/replace.rs b/src/builtins/string/replace.rs
similarity index 100%
rename from fish-rust/src/builtins/string/replace.rs
rename to src/builtins/string/replace.rs
diff --git a/fish-rust/src/builtins/string/shorten.rs b/src/builtins/string/shorten.rs
similarity index 100%
rename from fish-rust/src/builtins/string/shorten.rs
rename to src/builtins/string/shorten.rs
diff --git a/fish-rust/src/builtins/string/split.rs b/src/builtins/string/split.rs
similarity index 100%
rename from fish-rust/src/builtins/string/split.rs
rename to src/builtins/string/split.rs
diff --git a/fish-rust/src/builtins/string/sub.rs b/src/builtins/string/sub.rs
similarity index 100%
rename from fish-rust/src/builtins/string/sub.rs
rename to src/builtins/string/sub.rs
diff --git a/fish-rust/src/builtins/string/transform.rs b/src/builtins/string/transform.rs
similarity index 100%
rename from fish-rust/src/builtins/string/transform.rs
rename to src/builtins/string/transform.rs
diff --git a/fish-rust/src/builtins/string/trim.rs b/src/builtins/string/trim.rs
similarity index 100%
rename from fish-rust/src/builtins/string/trim.rs
rename to src/builtins/string/trim.rs
diff --git a/fish-rust/src/builtins/string/unescape.rs b/src/builtins/string/unescape.rs
similarity index 100%
rename from fish-rust/src/builtins/string/unescape.rs
rename to src/builtins/string/unescape.rs
diff --git a/fish-rust/src/builtins/test.rs b/src/builtins/test.rs
similarity index 100%
rename from fish-rust/src/builtins/test.rs
rename to src/builtins/test.rs
diff --git a/fish-rust/src/builtins/tests/mod.rs b/src/builtins/tests/mod.rs
similarity index 100%
rename from fish-rust/src/builtins/tests/mod.rs
rename to src/builtins/tests/mod.rs
diff --git a/fish-rust/src/builtins/tests/string_tests.rs b/src/builtins/tests/string_tests.rs
similarity index 100%
rename from fish-rust/src/builtins/tests/string_tests.rs
rename to src/builtins/tests/string_tests.rs
diff --git a/fish-rust/src/builtins/tests/test_tests.rs b/src/builtins/tests/test_tests.rs
similarity index 100%
rename from fish-rust/src/builtins/tests/test_tests.rs
rename to src/builtins/tests/test_tests.rs
diff --git a/fish-rust/src/builtins/type.rs b/src/builtins/type.rs
similarity index 100%
rename from fish-rust/src/builtins/type.rs
rename to src/builtins/type.rs
diff --git a/fish-rust/src/builtins/ulimit.rs b/src/builtins/ulimit.rs
similarity index 100%
rename from fish-rust/src/builtins/ulimit.rs
rename to src/builtins/ulimit.rs
diff --git a/fish-rust/src/builtins/wait.rs b/src/builtins/wait.rs
similarity index 100%
rename from fish-rust/src/builtins/wait.rs
rename to src/builtins/wait.rs
diff --git a/fish-rust/src/cfg/eventfd.c b/src/cfg/eventfd.c
similarity index 100%
rename from fish-rust/src/cfg/eventfd.c
rename to src/cfg/eventfd.c
diff --git a/fish-rust/src/cfg/pipe2.c b/src/cfg/pipe2.c
similarity index 100%
rename from fish-rust/src/cfg/pipe2.c
rename to src/cfg/pipe2.c
diff --git a/fish-rust/src/cfg/spawn.c b/src/cfg/spawn.c
similarity index 100%
rename from fish-rust/src/cfg/spawn.c
rename to src/cfg/spawn.c
diff --git a/fish-rust/src/cfg/w_exitcode.cpp b/src/cfg/w_exitcode.cpp
similarity index 100%
rename from fish-rust/src/cfg/w_exitcode.cpp
rename to src/cfg/w_exitcode.cpp
diff --git a/fish-rust/src/color.rs b/src/color.rs
similarity index 100%
rename from fish-rust/src/color.rs
rename to src/color.rs
diff --git a/fish-rust/src/common.rs b/src/common.rs
similarity index 100%
rename from fish-rust/src/common.rs
rename to src/common.rs
diff --git a/fish-rust/src/complete.rs b/src/complete.rs
similarity index 100%
rename from fish-rust/src/complete.rs
rename to src/complete.rs
diff --git a/fish-rust/src/curses.rs b/src/curses.rs
similarity index 100%
rename from fish-rust/src/curses.rs
rename to src/curses.rs
diff --git a/fish-rust/src/editable_line.rs b/src/editable_line.rs
similarity index 100%
rename from fish-rust/src/editable_line.rs
rename to src/editable_line.rs
diff --git a/fish-rust/src/env/environment.rs b/src/env/environment.rs
similarity index 100%
rename from fish-rust/src/env/environment.rs
rename to src/env/environment.rs
diff --git a/fish-rust/src/env/environment_impl.rs b/src/env/environment_impl.rs
similarity index 100%
rename from fish-rust/src/env/environment_impl.rs
rename to src/env/environment_impl.rs
diff --git a/fish-rust/src/env/mod.rs b/src/env/mod.rs
similarity index 100%
rename from fish-rust/src/env/mod.rs
rename to src/env/mod.rs
diff --git a/fish-rust/src/env/var.rs b/src/env/var.rs
similarity index 100%
rename from fish-rust/src/env/var.rs
rename to src/env/var.rs
diff --git a/fish-rust/src/env_dispatch.rs b/src/env_dispatch.rs
similarity index 100%
rename from fish-rust/src/env_dispatch.rs
rename to src/env_dispatch.rs
diff --git a/fish-rust/src/env_universal_common.rs b/src/env_universal_common.rs
similarity index 100%
rename from fish-rust/src/env_universal_common.rs
rename to src/env_universal_common.rs
diff --git a/fish-rust/src/event.rs b/src/event.rs
similarity index 100%
rename from fish-rust/src/event.rs
rename to src/event.rs
diff --git a/fish-rust/src/exec.rs b/src/exec.rs
similarity index 100%
rename from fish-rust/src/exec.rs
rename to src/exec.rs
diff --git a/fish-rust/src/expand.rs b/src/expand.rs
similarity index 100%
rename from fish-rust/src/expand.rs
rename to src/expand.rs
diff --git a/fish-rust/src/fallback.rs b/src/fallback.rs
similarity index 100%
rename from fish-rust/src/fallback.rs
rename to src/fallback.rs
diff --git a/fish-rust/src/fd_monitor.rs b/src/fd_monitor.rs
similarity index 100%
rename from fish-rust/src/fd_monitor.rs
rename to src/fd_monitor.rs
diff --git a/fish-rust/src/fd_readable_set.rs b/src/fd_readable_set.rs
similarity index 100%
rename from fish-rust/src/fd_readable_set.rs
rename to src/fd_readable_set.rs
diff --git a/fish-rust/src/fds.rs b/src/fds.rs
similarity index 100%
rename from fish-rust/src/fds.rs
rename to src/fds.rs
diff --git a/fish-rust/src/flog.rs b/src/flog.rs
similarity index 100%
rename from fish-rust/src/flog.rs
rename to src/flog.rs
diff --git a/fish-rust/src/fork_exec/flog_safe.rs b/src/fork_exec/flog_safe.rs
similarity index 100%
rename from fish-rust/src/fork_exec/flog_safe.rs
rename to src/fork_exec/flog_safe.rs
diff --git a/fish-rust/src/fork_exec/mod.rs b/src/fork_exec/mod.rs
similarity index 100%
rename from fish-rust/src/fork_exec/mod.rs
rename to src/fork_exec/mod.rs
diff --git a/fish-rust/src/fork_exec/postfork.rs b/src/fork_exec/postfork.rs
similarity index 100%
rename from fish-rust/src/fork_exec/postfork.rs
rename to src/fork_exec/postfork.rs
diff --git a/fish-rust/src/fork_exec/spawn.rs b/src/fork_exec/spawn.rs
similarity index 100%
rename from fish-rust/src/fork_exec/spawn.rs
rename to src/fork_exec/spawn.rs
diff --git a/fish-rust/src/function.rs b/src/function.rs
similarity index 100%
rename from fish-rust/src/function.rs
rename to src/function.rs
diff --git a/fish-rust/src/future.rs b/src/future.rs
similarity index 100%
rename from fish-rust/src/future.rs
rename to src/future.rs
diff --git a/fish-rust/src/future_feature_flags.rs b/src/future_feature_flags.rs
similarity index 100%
rename from fish-rust/src/future_feature_flags.rs
rename to src/future_feature_flags.rs
diff --git a/fish-rust/src/global_safety.rs b/src/global_safety.rs
similarity index 100%
rename from fish-rust/src/global_safety.rs
rename to src/global_safety.rs
diff --git a/fish-rust/src/highlight.rs b/src/highlight.rs
similarity index 100%
rename from fish-rust/src/highlight.rs
rename to src/highlight.rs
diff --git a/fish-rust/src/history.rs b/src/history.rs
similarity index 100%
rename from fish-rust/src/history.rs
rename to src/history.rs
diff --git a/fish-rust/src/history/file.rs b/src/history/file.rs
similarity index 100%
rename from fish-rust/src/history/file.rs
rename to src/history/file.rs
diff --git a/fish-rust/src/input.rs b/src/input.rs
similarity index 100%
rename from fish-rust/src/input.rs
rename to src/input.rs
diff --git a/fish-rust/src/input_common.rs b/src/input_common.rs
similarity index 100%
rename from fish-rust/src/input_common.rs
rename to src/input_common.rs
diff --git a/fish-rust/src/io.rs b/src/io.rs
similarity index 100%
rename from fish-rust/src/io.rs
rename to src/io.rs
diff --git a/fish-rust/src/job_group.rs b/src/job_group.rs
similarity index 100%
rename from fish-rust/src/job_group.rs
rename to src/job_group.rs
diff --git a/fish-rust/src/kill.rs b/src/kill.rs
similarity index 100%
rename from fish-rust/src/kill.rs
rename to src/kill.rs
diff --git a/fish-rust/src/lib.rs b/src/lib.rs
similarity index 100%
rename from fish-rust/src/lib.rs
rename to src/lib.rs
diff --git a/fish-rust/src/libc.c b/src/libc.c
similarity index 100%
rename from fish-rust/src/libc.c
rename to src/libc.c
diff --git a/fish-rust/src/libc.rs b/src/libc.rs
similarity index 100%
rename from fish-rust/src/libc.rs
rename to src/libc.rs
diff --git a/fish-rust/src/locale.rs b/src/locale.rs
similarity index 100%
rename from fish-rust/src/locale.rs
rename to src/locale.rs
diff --git a/fish-rust/src/nix.rs b/src/nix.rs
similarity index 100%
rename from fish-rust/src/nix.rs
rename to src/nix.rs
diff --git a/fish-rust/src/null_terminated_array.rs b/src/null_terminated_array.rs
similarity index 100%
rename from fish-rust/src/null_terminated_array.rs
rename to src/null_terminated_array.rs
diff --git a/fish-rust/src/operation_context.rs b/src/operation_context.rs
similarity index 100%
rename from fish-rust/src/operation_context.rs
rename to src/operation_context.rs
diff --git a/fish-rust/src/output.rs b/src/output.rs
similarity index 100%
rename from fish-rust/src/output.rs
rename to src/output.rs
diff --git a/fish-rust/src/pager.rs b/src/pager.rs
similarity index 100%
rename from fish-rust/src/pager.rs
rename to src/pager.rs
diff --git a/fish-rust/src/parse_constants.rs b/src/parse_constants.rs
similarity index 100%
rename from fish-rust/src/parse_constants.rs
rename to src/parse_constants.rs
diff --git a/fish-rust/src/parse_execution.rs b/src/parse_execution.rs
similarity index 100%
rename from fish-rust/src/parse_execution.rs
rename to src/parse_execution.rs
diff --git a/fish-rust/src/parse_tree.rs b/src/parse_tree.rs
similarity index 100%
rename from fish-rust/src/parse_tree.rs
rename to src/parse_tree.rs
diff --git a/fish-rust/src/parse_util.rs b/src/parse_util.rs
similarity index 100%
rename from fish-rust/src/parse_util.rs
rename to src/parse_util.rs
diff --git a/fish-rust/src/parser.rs b/src/parser.rs
similarity index 100%
rename from fish-rust/src/parser.rs
rename to src/parser.rs
diff --git a/fish-rust/src/parser_keywords.rs b/src/parser_keywords.rs
similarity index 100%
rename from fish-rust/src/parser_keywords.rs
rename to src/parser_keywords.rs
diff --git a/fish-rust/src/path.rs b/src/path.rs
similarity index 100%
rename from fish-rust/src/path.rs
rename to src/path.rs
diff --git a/fish-rust/src/pointer.rs b/src/pointer.rs
similarity index 100%
rename from fish-rust/src/pointer.rs
rename to src/pointer.rs
diff --git a/fish-rust/src/print_help.rs b/src/print_help.rs
similarity index 100%
rename from fish-rust/src/print_help.rs
rename to src/print_help.rs
diff --git a/fish-rust/src/proc.rs b/src/proc.rs
similarity index 100%
rename from fish-rust/src/proc.rs
rename to src/proc.rs
diff --git a/fish-rust/src/re.rs b/src/re.rs
similarity index 100%
rename from fish-rust/src/re.rs
rename to src/re.rs
diff --git a/fish-rust/src/reader.rs b/src/reader.rs
similarity index 100%
rename from fish-rust/src/reader.rs
rename to src/reader.rs
diff --git a/fish-rust/src/reader_history_search.rs b/src/reader_history_search.rs
similarity index 100%
rename from fish-rust/src/reader_history_search.rs
rename to src/reader_history_search.rs
diff --git a/fish-rust/src/redirection.rs b/src/redirection.rs
similarity index 100%
rename from fish-rust/src/redirection.rs
rename to src/redirection.rs
diff --git a/fish-rust/src/screen.rs b/src/screen.rs
similarity index 100%
rename from fish-rust/src/screen.rs
rename to src/screen.rs
diff --git a/fish-rust/src/signal.rs b/src/signal.rs
similarity index 100%
rename from fish-rust/src/signal.rs
rename to src/signal.rs
diff --git a/fish-rust/src/termsize.rs b/src/termsize.rs
similarity index 100%
rename from fish-rust/src/termsize.rs
rename to src/termsize.rs
diff --git a/fish-rust/src/tests/abbrs.rs b/src/tests/abbrs.rs
similarity index 100%
rename from fish-rust/src/tests/abbrs.rs
rename to src/tests/abbrs.rs
diff --git a/fish-rust/src/tests/common.rs b/src/tests/common.rs
similarity index 100%
rename from fish-rust/src/tests/common.rs
rename to src/tests/common.rs
diff --git a/fish-rust/src/tests/complete.rs b/src/tests/complete.rs
similarity index 100%
rename from fish-rust/src/tests/complete.rs
rename to src/tests/complete.rs
diff --git a/fish-rust/src/tests/debounce.rs b/src/tests/debounce.rs
similarity index 100%
rename from fish-rust/src/tests/debounce.rs
rename to src/tests/debounce.rs
diff --git a/fish-rust/src/tests/editable_line.rs b/src/tests/editable_line.rs
similarity index 100%
rename from fish-rust/src/tests/editable_line.rs
rename to src/tests/editable_line.rs
diff --git a/fish-rust/src/tests/encoding.rs b/src/tests/encoding.rs
similarity index 100%
rename from fish-rust/src/tests/encoding.rs
rename to src/tests/encoding.rs
diff --git a/fish-rust/src/tests/env.rs b/src/tests/env.rs
similarity index 100%
rename from fish-rust/src/tests/env.rs
rename to src/tests/env.rs
diff --git a/fish-rust/src/tests/env_universal_common.rs b/src/tests/env_universal_common.rs
similarity index 100%
rename from fish-rust/src/tests/env_universal_common.rs
rename to src/tests/env_universal_common.rs
diff --git a/fish-rust/src/tests/expand.rs b/src/tests/expand.rs
similarity index 100%
rename from fish-rust/src/tests/expand.rs
rename to src/tests/expand.rs
diff --git a/fish-rust/src/tests/fd_monitor.rs b/src/tests/fd_monitor.rs
similarity index 100%
rename from fish-rust/src/tests/fd_monitor.rs
rename to src/tests/fd_monitor.rs
diff --git a/fish-rust/src/tests/highlight.rs b/src/tests/highlight.rs
similarity index 100%
rename from fish-rust/src/tests/highlight.rs
rename to src/tests/highlight.rs
diff --git a/fish-rust/src/tests/history.rs b/src/tests/history.rs
similarity index 100%
rename from fish-rust/src/tests/history.rs
rename to src/tests/history.rs
diff --git a/fish-rust/src/tests/mod.rs b/src/tests/mod.rs
similarity index 100%
rename from fish-rust/src/tests/mod.rs
rename to src/tests/mod.rs
diff --git a/fish-rust/src/tests/pager.rs b/src/tests/pager.rs
similarity index 100%
rename from fish-rust/src/tests/pager.rs
rename to src/tests/pager.rs
diff --git a/fish-rust/src/tests/parse_util.rs b/src/tests/parse_util.rs
similarity index 100%
rename from fish-rust/src/tests/parse_util.rs
rename to src/tests/parse_util.rs
diff --git a/fish-rust/src/tests/parser.rs b/src/tests/parser.rs
similarity index 100%
rename from fish-rust/src/tests/parser.rs
rename to src/tests/parser.rs
diff --git a/fish-rust/src/tests/reader.rs b/src/tests/reader.rs
similarity index 100%
rename from fish-rust/src/tests/reader.rs
rename to src/tests/reader.rs
diff --git a/fish-rust/src/tests/redirection.rs b/src/tests/redirection.rs
similarity index 100%
rename from fish-rust/src/tests/redirection.rs
rename to src/tests/redirection.rs
diff --git a/fish-rust/src/tests/screen.rs b/src/tests/screen.rs
similarity index 100%
rename from fish-rust/src/tests/screen.rs
rename to src/tests/screen.rs
diff --git a/fish-rust/src/tests/string_escape.rs b/src/tests/string_escape.rs
similarity index 100%
rename from fish-rust/src/tests/string_escape.rs
rename to src/tests/string_escape.rs
diff --git a/fish-rust/src/tests/threads.rs b/src/tests/threads.rs
similarity index 100%
rename from fish-rust/src/tests/threads.rs
rename to src/tests/threads.rs
diff --git a/fish-rust/src/tests/tokenizer.rs b/src/tests/tokenizer.rs
similarity index 100%
rename from fish-rust/src/tests/tokenizer.rs
rename to src/tests/tokenizer.rs
diff --git a/fish-rust/src/tests/topic_monitor.rs b/src/tests/topic_monitor.rs
similarity index 100%
rename from fish-rust/src/tests/topic_monitor.rs
rename to src/tests/topic_monitor.rs
diff --git a/fish-rust/src/tests/wgetopt.rs b/src/tests/wgetopt.rs
similarity index 100%
rename from fish-rust/src/tests/wgetopt.rs
rename to src/tests/wgetopt.rs
diff --git a/fish-rust/src/threads.rs b/src/threads.rs
similarity index 100%
rename from fish-rust/src/threads.rs
rename to src/threads.rs
diff --git a/fish-rust/src/timer.rs b/src/timer.rs
similarity index 100%
rename from fish-rust/src/timer.rs
rename to src/timer.rs
diff --git a/fish-rust/src/tinyexpr.rs b/src/tinyexpr.rs
similarity index 100%
rename from fish-rust/src/tinyexpr.rs
rename to src/tinyexpr.rs
diff --git a/fish-rust/src/tokenizer.rs b/src/tokenizer.rs
similarity index 100%
rename from fish-rust/src/tokenizer.rs
rename to src/tokenizer.rs
diff --git a/fish-rust/src/topic_monitor.rs b/src/topic_monitor.rs
similarity index 100%
rename from fish-rust/src/topic_monitor.rs
rename to src/topic_monitor.rs
diff --git a/fish-rust/src/trace.rs b/src/trace.rs
similarity index 100%
rename from fish-rust/src/trace.rs
rename to src/trace.rs
diff --git a/fish-rust/src/universal_notifier/inotify.rs b/src/universal_notifier/inotify.rs
similarity index 100%
rename from fish-rust/src/universal_notifier/inotify.rs
rename to src/universal_notifier/inotify.rs
diff --git a/fish-rust/src/universal_notifier/mod.rs b/src/universal_notifier/mod.rs
similarity index 100%
rename from fish-rust/src/universal_notifier/mod.rs
rename to src/universal_notifier/mod.rs
diff --git a/fish-rust/src/universal_notifier/notifyd.rs b/src/universal_notifier/notifyd.rs
similarity index 100%
rename from fish-rust/src/universal_notifier/notifyd.rs
rename to src/universal_notifier/notifyd.rs
diff --git a/fish-rust/src/universal_notifier/test_helpers.rs b/src/universal_notifier/test_helpers.rs
similarity index 100%
rename from fish-rust/src/universal_notifier/test_helpers.rs
rename to src/universal_notifier/test_helpers.rs
diff --git a/fish-rust/src/util.rs b/src/util.rs
similarity index 100%
rename from fish-rust/src/util.rs
rename to src/util.rs
diff --git a/fish-rust/src/wait_handle.rs b/src/wait_handle.rs
similarity index 100%
rename from fish-rust/src/wait_handle.rs
rename to src/wait_handle.rs
diff --git a/fish-rust/src/wchar.rs b/src/wchar.rs
similarity index 100%
rename from fish-rust/src/wchar.rs
rename to src/wchar.rs
diff --git a/fish-rust/src/wchar_ext.rs b/src/wchar_ext.rs
similarity index 100%
rename from fish-rust/src/wchar_ext.rs
rename to src/wchar_ext.rs
diff --git a/fish-rust/src/wcstringutil.rs b/src/wcstringutil.rs
similarity index 100%
rename from fish-rust/src/wcstringutil.rs
rename to src/wcstringutil.rs
diff --git a/fish-rust/src/wgetopt.rs b/src/wgetopt.rs
similarity index 100%
rename from fish-rust/src/wgetopt.rs
rename to src/wgetopt.rs
diff --git a/fish-rust/src/widecharwidth/LICENSE b/src/widecharwidth/LICENSE
similarity index 100%
rename from fish-rust/src/widecharwidth/LICENSE
rename to src/widecharwidth/LICENSE
diff --git a/fish-rust/src/widecharwidth/mod.rs b/src/widecharwidth/mod.rs
similarity index 100%
rename from fish-rust/src/widecharwidth/mod.rs
rename to src/widecharwidth/mod.rs
diff --git a/fish-rust/src/widecharwidth/widechar_width.rs b/src/widecharwidth/widechar_width.rs
similarity index 100%
rename from fish-rust/src/widecharwidth/widechar_width.rs
rename to src/widecharwidth/widechar_width.rs
diff --git a/fish-rust/src/wildcard.rs b/src/wildcard.rs
similarity index 100%
rename from fish-rust/src/wildcard.rs
rename to src/wildcard.rs
diff --git a/fish-rust/src/wutil/dir_iter.rs b/src/wutil/dir_iter.rs
similarity index 100%
rename from fish-rust/src/wutil/dir_iter.rs
rename to src/wutil/dir_iter.rs
diff --git a/fish-rust/src/wutil/encoding.rs b/src/wutil/encoding.rs
similarity index 100%
rename from fish-rust/src/wutil/encoding.rs
rename to src/wutil/encoding.rs
diff --git a/fish-rust/src/wutil/errors.rs b/src/wutil/errors.rs
similarity index 100%
rename from fish-rust/src/wutil/errors.rs
rename to src/wutil/errors.rs
diff --git a/fish-rust/src/wutil/fileid.rs b/src/wutil/fileid.rs
similarity index 100%
rename from fish-rust/src/wutil/fileid.rs
rename to src/wutil/fileid.rs
diff --git a/fish-rust/src/wutil/gettext.rs b/src/wutil/gettext.rs
similarity index 100%
rename from fish-rust/src/wutil/gettext.rs
rename to src/wutil/gettext.rs
diff --git a/fish-rust/src/wutil/mod.rs b/src/wutil/mod.rs
similarity index 100%
rename from fish-rust/src/wutil/mod.rs
rename to src/wutil/mod.rs
diff --git a/fish-rust/src/wutil/printf.rs b/src/wutil/printf.rs
similarity index 100%
rename from fish-rust/src/wutil/printf.rs
rename to src/wutil/printf.rs
diff --git a/fish-rust/src/wutil/tests.rs b/src/wutil/tests.rs
similarity index 100%
rename from fish-rust/src/wutil/tests.rs
rename to src/wutil/tests.rs
diff --git a/fish-rust/src/wutil/wcstod.rs b/src/wutil/wcstod.rs
similarity index 100%
rename from fish-rust/src/wutil/wcstod.rs
rename to src/wutil/wcstod.rs
diff --git a/fish-rust/src/wutil/wcstoi.rs b/src/wutil/wcstoi.rs
similarity index 100%
rename from fish-rust/src/wutil/wcstoi.rs
rename to src/wutil/wcstoi.rs
diff --git a/fish-rust/widestring-suffix/Cargo.toml b/widestring-suffix/Cargo.toml
similarity index 100%
rename from fish-rust/widestring-suffix/Cargo.toml
rename to widestring-suffix/Cargo.toml
diff --git a/fish-rust/widestring-suffix/src/lib.rs b/widestring-suffix/src/lib.rs
similarity index 100%
rename from fish-rust/widestring-suffix/src/lib.rs
rename to widestring-suffix/src/lib.rs
diff --git a/fish-rust/widestring-suffix/tests/test.rs b/widestring-suffix/tests/test.rs
similarity index 100%
rename from fish-rust/widestring-suffix/tests/test.rs
rename to widestring-suffix/tests/test.rs