diff --git a/awk/Cargo.toml b/awk/Cargo.toml
index 6dc285a5..3b1bb2eb 100644
--- a/awk/Cargo.toml
+++ b/awk/Cargo.toml
@@ -13,7 +13,7 @@ libc.workspace = true
 pest = "2.7"
 pest_derive = "2.7"
 lexical = { version = "6.1", features = ["format"] }
-rand = {version = "0.8", default-features = false, features = ["small_rng"] }
+rand = { version = "0.8", default-features = false, features = ["small_rng"] }
 
 [dev-dependencies]
 plib = { path = "../plib" }
@@ -23,4 +23,4 @@ workspace = true
 
 [[bin]]
 name = "awk"
-path = "src/main.rs"
+path = "main.rs"
diff --git a/awk/src/compiler.rs b/awk/compiler.rs
similarity index 100%
rename from awk/src/compiler.rs
rename to awk/compiler.rs
diff --git a/awk/src/grammar.pest b/awk/grammar.pest
similarity index 100%
rename from awk/src/grammar.pest
rename to awk/grammar.pest
diff --git a/awk/src/interpreter/array.rs b/awk/interpreter/array.rs
similarity index 100%
rename from awk/src/interpreter/array.rs
rename to awk/interpreter/array.rs
diff --git a/awk/src/interpreter/format.rs b/awk/interpreter/format.rs
similarity index 100%
rename from awk/src/interpreter/format.rs
rename to awk/interpreter/format.rs
diff --git a/awk/src/interpreter/io.rs b/awk/interpreter/io.rs
similarity index 100%
rename from awk/src/interpreter/io.rs
rename to awk/interpreter/io.rs
diff --git a/awk/src/interpreter/mod.rs b/awk/interpreter/mod.rs
similarity index 100%
rename from awk/src/interpreter/mod.rs
rename to awk/interpreter/mod.rs
diff --git a/awk/src/interpreter/string.rs b/awk/interpreter/string.rs
similarity index 100%
rename from awk/src/interpreter/string.rs
rename to awk/interpreter/string.rs
diff --git a/awk/src/main.rs b/awk/main.rs
similarity index 100%
rename from awk/src/main.rs
rename to awk/main.rs
diff --git a/awk/src/program.rs b/awk/program.rs
similarity index 100%
rename from awk/src/program.rs
rename to awk/program.rs
diff --git a/awk/src/regex.rs b/awk/regex.rs
similarity index 100%
rename from awk/src/regex.rs
rename to awk/regex.rs
diff --git a/sh/Cargo.toml b/sh/Cargo.toml
index d13403eb..41d95c00 100644
--- a/sh/Cargo.toml
+++ b/sh/Cargo.toml
@@ -11,4 +11,4 @@ atty = "0.2"
 
 [[bin]]
 name = "sh"
-path = "src/main.rs"
+path = "main.rs"
diff --git a/sh/src/builtin/alias.rs b/sh/builtin/alias.rs
similarity index 100%
rename from sh/src/builtin/alias.rs
rename to sh/builtin/alias.rs
diff --git a/sh/src/builtin/bg.rs b/sh/builtin/bg.rs
similarity index 100%
rename from sh/src/builtin/bg.rs
rename to sh/builtin/bg.rs
diff --git a/sh/src/builtin/cd.rs b/sh/builtin/cd.rs
similarity index 100%
rename from sh/src/builtin/cd.rs
rename to sh/builtin/cd.rs
diff --git a/sh/src/builtin/command.rs b/sh/builtin/command.rs
similarity index 100%
rename from sh/src/builtin/command.rs
rename to sh/builtin/command.rs
diff --git a/sh/src/builtin/control_flow.rs b/sh/builtin/control_flow.rs
similarity index 100%
rename from sh/src/builtin/control_flow.rs
rename to sh/builtin/control_flow.rs
diff --git a/sh/src/builtin/dot.rs b/sh/builtin/dot.rs
similarity index 100%
rename from sh/src/builtin/dot.rs
rename to sh/builtin/dot.rs
diff --git a/sh/src/builtin/eval.rs b/sh/builtin/eval.rs
similarity index 100%
rename from sh/src/builtin/eval.rs
rename to sh/builtin/eval.rs
diff --git a/sh/src/builtin/exec.rs b/sh/builtin/exec.rs
similarity index 100%
rename from sh/src/builtin/exec.rs
rename to sh/builtin/exec.rs
diff --git a/sh/src/builtin/exit.rs b/sh/builtin/exit.rs
similarity index 100%
rename from sh/src/builtin/exit.rs
rename to sh/builtin/exit.rs
diff --git a/sh/src/builtin/export.rs b/sh/builtin/export.rs
similarity index 100%
rename from sh/src/builtin/export.rs
rename to sh/builtin/export.rs
diff --git a/sh/src/builtin/fc.rs b/sh/builtin/fc.rs
similarity index 100%
rename from sh/src/builtin/fc.rs
rename to sh/builtin/fc.rs
diff --git a/sh/src/builtin/fg.rs b/sh/builtin/fg.rs
similarity index 100%
rename from sh/src/builtin/fg.rs
rename to sh/builtin/fg.rs
diff --git a/sh/src/builtin/getopts.rs b/sh/builtin/getopts.rs
similarity index 100%
rename from sh/src/builtin/getopts.rs
rename to sh/builtin/getopts.rs
diff --git a/sh/src/builtin/hash.rs b/sh/builtin/hash.rs
similarity index 100%
rename from sh/src/builtin/hash.rs
rename to sh/builtin/hash.rs
diff --git a/sh/src/builtin/jobs.rs b/sh/builtin/jobs.rs
similarity index 100%
rename from sh/src/builtin/jobs.rs
rename to sh/builtin/jobs.rs
diff --git a/sh/src/builtin/kill.rs b/sh/builtin/kill.rs
similarity index 100%
rename from sh/src/builtin/kill.rs
rename to sh/builtin/kill.rs
diff --git a/sh/src/builtin/mod.rs b/sh/builtin/mod.rs
similarity index 100%
rename from sh/src/builtin/mod.rs
rename to sh/builtin/mod.rs
diff --git a/sh/src/builtin/read.rs b/sh/builtin/read.rs
similarity index 100%
rename from sh/src/builtin/read.rs
rename to sh/builtin/read.rs
diff --git a/sh/src/builtin/readonly.rs b/sh/builtin/readonly.rs
similarity index 100%
rename from sh/src/builtin/readonly.rs
rename to sh/builtin/readonly.rs
diff --git a/sh/src/builtin/set.rs b/sh/builtin/set.rs
similarity index 100%
rename from sh/src/builtin/set.rs
rename to sh/builtin/set.rs
diff --git a/sh/src/builtin/shift.rs b/sh/builtin/shift.rs
similarity index 100%
rename from sh/src/builtin/shift.rs
rename to sh/builtin/shift.rs
diff --git a/sh/src/builtin/times.rs b/sh/builtin/times.rs
similarity index 100%
rename from sh/src/builtin/times.rs
rename to sh/builtin/times.rs
diff --git a/sh/src/builtin/trap.rs b/sh/builtin/trap.rs
similarity index 100%
rename from sh/src/builtin/trap.rs
rename to sh/builtin/trap.rs
diff --git a/sh/src/builtin/type_.rs b/sh/builtin/type_.rs
similarity index 100%
rename from sh/src/builtin/type_.rs
rename to sh/builtin/type_.rs
diff --git a/sh/src/builtin/ulimit.rs b/sh/builtin/ulimit.rs
similarity index 100%
rename from sh/src/builtin/ulimit.rs
rename to sh/builtin/ulimit.rs
diff --git a/sh/src/builtin/umask.rs b/sh/builtin/umask.rs
similarity index 100%
rename from sh/src/builtin/umask.rs
rename to sh/builtin/umask.rs
diff --git a/sh/src/builtin/unalias.rs b/sh/builtin/unalias.rs
similarity index 100%
rename from sh/src/builtin/unalias.rs
rename to sh/builtin/unalias.rs
diff --git a/sh/src/builtin/unset.rs b/sh/builtin/unset.rs
similarity index 100%
rename from sh/src/builtin/unset.rs
rename to sh/builtin/unset.rs
diff --git a/sh/src/builtin/wait.rs b/sh/builtin/wait.rs
similarity index 100%
rename from sh/src/builtin/wait.rs
rename to sh/builtin/wait.rs
diff --git a/sh/src/cli/args.rs b/sh/cli/args.rs
similarity index 100%
rename from sh/src/cli/args.rs
rename to sh/cli/args.rs
diff --git a/sh/src/cli/mod.rs b/sh/cli/mod.rs
similarity index 100%
rename from sh/src/cli/mod.rs
rename to sh/cli/mod.rs
diff --git a/sh/src/cli/terminal.rs b/sh/cli/terminal.rs
similarity index 100%
rename from sh/src/cli/terminal.rs
rename to sh/cli/terminal.rs
diff --git a/sh/src/cli/vi/cursor.rs b/sh/cli/vi/cursor.rs
similarity index 100%
rename from sh/src/cli/vi/cursor.rs
rename to sh/cli/vi/cursor.rs
diff --git a/sh/src/cli/vi/mod.rs b/sh/cli/vi/mod.rs
similarity index 100%
rename from sh/src/cli/vi/mod.rs
rename to sh/cli/vi/mod.rs
diff --git a/sh/src/cli/vi/word.rs b/sh/cli/vi/word.rs
similarity index 100%
rename from sh/src/cli/vi/word.rs
rename to sh/cli/vi/word.rs
diff --git a/sh/src/jobs.rs b/sh/jobs.rs
similarity index 100%
rename from sh/src/jobs.rs
rename to sh/jobs.rs
diff --git a/sh/src/main.rs b/sh/main.rs
similarity index 100%
rename from sh/src/main.rs
rename to sh/main.rs
diff --git a/sh/src/nonempty.rs b/sh/nonempty.rs
similarity index 100%
rename from sh/src/nonempty.rs
rename to sh/nonempty.rs
diff --git a/sh/src/option_parser.rs b/sh/option_parser.rs
similarity index 100%
rename from sh/src/option_parser.rs
rename to sh/option_parser.rs
diff --git a/sh/src/parse/command.rs b/sh/parse/command.rs
similarity index 100%
rename from sh/src/parse/command.rs
rename to sh/parse/command.rs
diff --git a/sh/src/parse/command_parser.rs b/sh/parse/command_parser.rs
similarity index 100%
rename from sh/src/parse/command_parser.rs
rename to sh/parse/command_parser.rs
diff --git a/sh/src/parse/lexer/command_lexer.rs b/sh/parse/lexer/command_lexer.rs
similarity index 100%
rename from sh/src/parse/lexer/command_lexer.rs
rename to sh/parse/lexer/command_lexer.rs
diff --git a/sh/src/parse/lexer/mod.rs b/sh/parse/lexer/mod.rs
similarity index 100%
rename from sh/src/parse/lexer/mod.rs
rename to sh/parse/lexer/mod.rs
diff --git a/sh/src/parse/lexer/word_lexer.rs b/sh/parse/lexer/word_lexer.rs
similarity index 100%
rename from sh/src/parse/lexer/word_lexer.rs
rename to sh/parse/lexer/word_lexer.rs
diff --git a/sh/src/parse/mod.rs b/sh/parse/mod.rs
similarity index 100%
rename from sh/src/parse/mod.rs
rename to sh/parse/mod.rs
diff --git a/sh/src/parse/word.rs b/sh/parse/word.rs
similarity index 100%
rename from sh/src/parse/word.rs
rename to sh/parse/word.rs
diff --git a/sh/src/parse/word_parser.rs b/sh/parse/word_parser.rs
similarity index 100%
rename from sh/src/parse/word_parser.rs
rename to sh/parse/word_parser.rs
diff --git a/sh/src/pattern/mod.rs b/sh/pattern/mod.rs
similarity index 100%
rename from sh/src/pattern/mod.rs
rename to sh/pattern/mod.rs
diff --git a/sh/src/pattern/parse.rs b/sh/pattern/parse.rs
similarity index 100%
rename from sh/src/pattern/parse.rs
rename to sh/pattern/parse.rs
diff --git a/sh/src/pattern/regex.rs b/sh/pattern/regex.rs
similarity index 100%
rename from sh/src/pattern/regex.rs
rename to sh/pattern/regex.rs
diff --git a/sh/src/shell/environment.rs b/sh/shell/environment.rs
similarity index 100%
rename from sh/src/shell/environment.rs
rename to sh/shell/environment.rs
diff --git a/sh/src/shell/history.rs b/sh/shell/history.rs
similarity index 100%
rename from sh/src/shell/history.rs
rename to sh/shell/history.rs
diff --git a/sh/src/shell/mod.rs b/sh/shell/mod.rs
similarity index 100%
rename from sh/src/shell/mod.rs
rename to sh/shell/mod.rs
diff --git a/sh/src/shell/opened_files.rs b/sh/shell/opened_files.rs
similarity index 100%
rename from sh/src/shell/opened_files.rs
rename to sh/shell/opened_files.rs
diff --git a/sh/src/signals.rs b/sh/signals.rs
similarity index 100%
rename from sh/src/signals.rs
rename to sh/signals.rs
diff --git a/sh/src/utils.rs b/sh/utils.rs
similarity index 100%
rename from sh/src/utils.rs
rename to sh/utils.rs
diff --git a/sh/src/wordexp/arithmetic.rs b/sh/wordexp/arithmetic.rs
similarity index 100%
rename from sh/src/wordexp/arithmetic.rs
rename to sh/wordexp/arithmetic.rs
diff --git a/sh/src/wordexp/expanded_word.rs b/sh/wordexp/expanded_word.rs
similarity index 100%
rename from sh/src/wordexp/expanded_word.rs
rename to sh/wordexp/expanded_word.rs
diff --git a/sh/src/wordexp/mod.rs b/sh/wordexp/mod.rs
similarity index 100%
rename from sh/src/wordexp/mod.rs
rename to sh/wordexp/mod.rs
diff --git a/sh/src/wordexp/parameter.rs b/sh/wordexp/parameter.rs
similarity index 100%
rename from sh/src/wordexp/parameter.rs
rename to sh/wordexp/parameter.rs
diff --git a/sh/src/wordexp/pathname.rs b/sh/wordexp/pathname.rs
similarity index 100%
rename from sh/src/wordexp/pathname.rs
rename to sh/wordexp/pathname.rs
diff --git a/sh/src/wordexp/tilde.rs b/sh/wordexp/tilde.rs
similarity index 100%
rename from sh/src/wordexp/tilde.rs
rename to sh/wordexp/tilde.rs