diff --git a/old_nushell/.azure/azure-pipelines.yml b/.azureold/azure-pipelines.yml
similarity index 100%
rename from old_nushell/.azure/azure-pipelines.yml
rename to .azureold/azure-pipelines.yml
diff --git a/old_nushell/.cargo/config.toml b/.cargo/config.toml
similarity index 100%
rename from old_nushell/.cargo/config.toml
rename to .cargo/config.toml
diff --git a/old_nushell/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
similarity index 100%
rename from old_nushell/.github/ISSUE_TEMPLATE/bug_report.yml
rename to .github/ISSUE_TEMPLATE/bug_report.yml
diff --git a/old_nushell/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
similarity index 100%
rename from old_nushell/.github/ISSUE_TEMPLATE/feature_request.yml
rename to .github/ISSUE_TEMPLATE/feature_request.yml
diff --git a/old_nushell/.github/workflows/release.yml b/.github/workflows/release.yml
similarity index 100%
rename from old_nushell/.github/workflows/release.yml
rename to .github/workflows/release.yml
diff --git a/old_nushell/.github/workflows/stale.yml b/.github/workflows/stale.yml
similarity index 100%
rename from old_nushell/.github/workflows/stale.yml
rename to .github/workflows/stale.yml
diff --git a/old_nushell/.github/workflows/winget-submission.yml b/.github/workflows/winget-submission.yml
similarity index 100%
rename from old_nushell/.github/workflows/winget-submission.yml
rename to .github/workflows/winget-submission.yml
diff --git a/old_nushell/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
similarity index 100%
rename from old_nushell/CODE_OF_CONDUCT.md
rename to CODE_OF_CONDUCT.md
diff --git a/old_nushell/CONTRIBUTING.md b/CONTRIBUTING.md
similarity index 100%
rename from old_nushell/CONTRIBUTING.md
rename to CONTRIBUTING.md
diff --git a/LICENSE b/LICENSE
index 4f295f214d..70f227d78f 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,10 +1,6 @@
 MIT License
 
-<<<<<<< HEAD
 Copyright (c) 2019 - 2021 Nushell Project
-=======
-Copyright (c) 2021 Nushell Project
->>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/old_nushell/Makefile.toml b/Makefile.toml
similarity index 100%
rename from old_nushell/Makefile.toml
rename to Makefile.toml
diff --git a/old_nushell/README.build.txt b/README.build.txt
similarity index 100%
rename from old_nushell/README.build.txt
rename to README.build.txt
diff --git a/README.md b/README.md
index 4c53564418..d77e61f103 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # README
 
 [![Crates.io](https://img.shields.io/crates/v/nu.svg)](https://crates.io/crates/nu)
@@ -286,4 +285,3 @@ The project is made available under the MIT license. See the `LICENSE` file for
 # NOTE: Engine-q is merged into Nushell
 
 Please use https://github.com/nushell/nushell
->>>>>>> 9259a56a28f1dd3a4b720ad815aa19c6eaf6adce
diff --git a/old_nushell/docs/commands/README.md b/docs/commands/README.md
similarity index 100%
rename from old_nushell/docs/commands/README.md
rename to docs/commands/README.md
diff --git a/old_nushell/docs/commands/alias.md b/docs/commands/alias.md
similarity index 100%
rename from old_nushell/docs/commands/alias.md
rename to docs/commands/alias.md
diff --git a/old_nushell/docs/commands/all.md b/docs/commands/all.md
similarity index 100%
rename from old_nushell/docs/commands/all.md
rename to docs/commands/all.md
diff --git a/old_nushell/docs/commands/ansi-strip.md b/docs/commands/ansi-strip.md
similarity index 100%
rename from old_nushell/docs/commands/ansi-strip.md
rename to docs/commands/ansi-strip.md
diff --git a/old_nushell/docs/commands/ansi.md b/docs/commands/ansi.md
similarity index 100%
rename from old_nushell/docs/commands/ansi.md
rename to docs/commands/ansi.md
diff --git a/old_nushell/docs/commands/any.md b/docs/commands/any.md
similarity index 100%
rename from old_nushell/docs/commands/any.md
rename to docs/commands/any.md
diff --git a/old_nushell/docs/commands/append.md b/docs/commands/append.md
similarity index 100%
rename from old_nushell/docs/commands/append.md
rename to docs/commands/append.md
diff --git a/old_nushell/docs/commands/autoenv-trust.md b/docs/commands/autoenv-trust.md
similarity index 100%
rename from old_nushell/docs/commands/autoenv-trust.md
rename to docs/commands/autoenv-trust.md
diff --git a/old_nushell/docs/commands/autoenv-untrust.md b/docs/commands/autoenv-untrust.md
similarity index 100%
rename from old_nushell/docs/commands/autoenv-untrust.md
rename to docs/commands/autoenv-untrust.md
diff --git a/old_nushell/docs/commands/autoenv.md b/docs/commands/autoenv.md
similarity index 100%
rename from old_nushell/docs/commands/autoenv.md
rename to docs/commands/autoenv.md
diff --git a/old_nushell/docs/commands/autoview.md b/docs/commands/autoview.md
similarity index 100%
rename from old_nushell/docs/commands/autoview.md
rename to docs/commands/autoview.md
diff --git a/old_nushell/docs/commands/benchmark.md b/docs/commands/benchmark.md
similarity index 100%
rename from old_nushell/docs/commands/benchmark.md
rename to docs/commands/benchmark.md
diff --git a/old_nushell/docs/commands/binaryview.md b/docs/commands/binaryview.md
similarity index 100%
rename from old_nushell/docs/commands/binaryview.md
rename to docs/commands/binaryview.md
diff --git a/old_nushell/docs/commands/build-string.md b/docs/commands/build-string.md
similarity index 100%
rename from old_nushell/docs/commands/build-string.md
rename to docs/commands/build-string.md
diff --git a/old_nushell/docs/commands/cal.md b/docs/commands/cal.md
similarity index 100%
rename from old_nushell/docs/commands/cal.md
rename to docs/commands/cal.md
diff --git a/old_nushell/docs/commands/cd.md b/docs/commands/cd.md
similarity index 100%
rename from old_nushell/docs/commands/cd.md
rename to docs/commands/cd.md
diff --git a/old_nushell/docs/commands/char.md b/docs/commands/char.md
similarity index 100%
rename from old_nushell/docs/commands/char.md
rename to docs/commands/char.md
diff --git a/old_nushell/docs/commands/chart-bar.md b/docs/commands/chart-bar.md
similarity index 100%
rename from old_nushell/docs/commands/chart-bar.md
rename to docs/commands/chart-bar.md
diff --git a/old_nushell/docs/commands/chart-line.md b/docs/commands/chart-line.md
similarity index 100%
rename from old_nushell/docs/commands/chart-line.md
rename to docs/commands/chart-line.md
diff --git a/old_nushell/docs/commands/chart.md b/docs/commands/chart.md
similarity index 100%
rename from old_nushell/docs/commands/chart.md
rename to docs/commands/chart.md
diff --git a/old_nushell/docs/commands/clear.md b/docs/commands/clear.md
similarity index 100%
rename from old_nushell/docs/commands/clear.md
rename to docs/commands/clear.md
diff --git a/old_nushell/docs/commands/clip.md b/docs/commands/clip.md
similarity index 100%
rename from old_nushell/docs/commands/clip.md
rename to docs/commands/clip.md
diff --git a/old_nushell/docs/commands/compact.md b/docs/commands/compact.md
similarity index 100%
rename from old_nushell/docs/commands/compact.md
rename to docs/commands/compact.md
diff --git a/old_nushell/docs/commands/config-clear.md b/docs/commands/config-clear.md
similarity index 100%
rename from old_nushell/docs/commands/config-clear.md
rename to docs/commands/config-clear.md
diff --git a/old_nushell/docs/commands/config-get.md b/docs/commands/config-get.md
similarity index 100%
rename from old_nushell/docs/commands/config-get.md
rename to docs/commands/config-get.md
diff --git a/old_nushell/docs/commands/config-path.md b/docs/commands/config-path.md
similarity index 100%
rename from old_nushell/docs/commands/config-path.md
rename to docs/commands/config-path.md
diff --git a/old_nushell/docs/commands/config-remove.md b/docs/commands/config-remove.md
similarity index 100%
rename from old_nushell/docs/commands/config-remove.md
rename to docs/commands/config-remove.md
diff --git a/old_nushell/docs/commands/config-set.md b/docs/commands/config-set.md
similarity index 100%
rename from old_nushell/docs/commands/config-set.md
rename to docs/commands/config-set.md
diff --git a/old_nushell/docs/commands/config-set_into.md b/docs/commands/config-set_into.md
similarity index 100%
rename from old_nushell/docs/commands/config-set_into.md
rename to docs/commands/config-set_into.md
diff --git a/old_nushell/docs/commands/config.md b/docs/commands/config.md
similarity index 100%
rename from old_nushell/docs/commands/config.md
rename to docs/commands/config.md
diff --git a/old_nushell/docs/commands/cp.md b/docs/commands/cp.md
similarity index 100%
rename from old_nushell/docs/commands/cp.md
rename to docs/commands/cp.md
diff --git a/old_nushell/docs/commands/date-format.md b/docs/commands/date-format.md
similarity index 100%
rename from old_nushell/docs/commands/date-format.md
rename to docs/commands/date-format.md
diff --git a/old_nushell/docs/commands/date-humanize.md b/docs/commands/date-humanize.md
similarity index 100%
rename from old_nushell/docs/commands/date-humanize.md
rename to docs/commands/date-humanize.md
diff --git a/old_nushell/docs/commands/date-list-timezone.md b/docs/commands/date-list-timezone.md
similarity index 100%
rename from old_nushell/docs/commands/date-list-timezone.md
rename to docs/commands/date-list-timezone.md
diff --git a/old_nushell/docs/commands/date-now.md b/docs/commands/date-now.md
similarity index 100%
rename from old_nushell/docs/commands/date-now.md
rename to docs/commands/date-now.md
diff --git a/old_nushell/docs/commands/date-to-table.md b/docs/commands/date-to-table.md
similarity index 100%
rename from old_nushell/docs/commands/date-to-table.md
rename to docs/commands/date-to-table.md
diff --git a/old_nushell/docs/commands/date-to-timezone.md b/docs/commands/date-to-timezone.md
similarity index 100%
rename from old_nushell/docs/commands/date-to-timezone.md
rename to docs/commands/date-to-timezone.md
diff --git a/old_nushell/docs/commands/date.md b/docs/commands/date.md
similarity index 100%
rename from old_nushell/docs/commands/date.md
rename to docs/commands/date.md
diff --git a/old_nushell/docs/commands/debug.md b/docs/commands/debug.md
similarity index 100%
rename from old_nushell/docs/commands/debug.md
rename to docs/commands/debug.md
diff --git a/old_nushell/docs/commands/def.md b/docs/commands/def.md
similarity index 100%
rename from old_nushell/docs/commands/def.md
rename to docs/commands/def.md
diff --git a/old_nushell/docs/commands/default.md b/docs/commands/default.md
similarity index 100%
rename from old_nushell/docs/commands/default.md
rename to docs/commands/default.md
diff --git a/old_nushell/docs/commands/describe.md b/docs/commands/describe.md
similarity index 100%
rename from old_nushell/docs/commands/describe.md
rename to docs/commands/describe.md
diff --git a/old_nushell/docs/commands/do.md b/docs/commands/do.md
similarity index 100%
rename from old_nushell/docs/commands/do.md
rename to docs/commands/do.md
diff --git a/old_nushell/docs/commands/drop-column.md b/docs/commands/drop-column.md
similarity index 100%
rename from old_nushell/docs/commands/drop-column.md
rename to docs/commands/drop-column.md
diff --git a/old_nushell/docs/commands/drop.md b/docs/commands/drop.md
similarity index 100%
rename from old_nushell/docs/commands/drop.md
rename to docs/commands/drop.md
diff --git a/old_nushell/docs/commands/du.md b/docs/commands/du.md
similarity index 100%
rename from old_nushell/docs/commands/du.md
rename to docs/commands/du.md
diff --git a/old_nushell/docs/commands/each-group.md b/docs/commands/each-group.md
similarity index 100%
rename from old_nushell/docs/commands/each-group.md
rename to docs/commands/each-group.md
diff --git a/old_nushell/docs/commands/each-window.md b/docs/commands/each-window.md
similarity index 100%
rename from old_nushell/docs/commands/each-window.md
rename to docs/commands/each-window.md
diff --git a/old_nushell/docs/commands/each.md b/docs/commands/each.md
similarity index 100%
rename from old_nushell/docs/commands/each.md
rename to docs/commands/each.md
diff --git a/old_nushell/docs/commands/echo.md b/docs/commands/echo.md
similarity index 100%
rename from old_nushell/docs/commands/echo.md
rename to docs/commands/echo.md
diff --git a/old_nushell/docs/commands/empty.md b/docs/commands/empty.md
similarity index 100%
rename from old_nushell/docs/commands/empty.md
rename to docs/commands/empty.md
diff --git a/old_nushell/docs/commands/enter.md b/docs/commands/enter.md
similarity index 100%
rename from old_nushell/docs/commands/enter.md
rename to docs/commands/enter.md
diff --git a/old_nushell/docs/commands/every.md b/docs/commands/every.md
similarity index 100%
rename from old_nushell/docs/commands/every.md
rename to docs/commands/every.md
diff --git a/old_nushell/docs/commands/exec.md b/docs/commands/exec.md
similarity index 100%
rename from old_nushell/docs/commands/exec.md
rename to docs/commands/exec.md
diff --git a/old_nushell/docs/commands/exit.md b/docs/commands/exit.md
similarity index 100%
rename from old_nushell/docs/commands/exit.md
rename to docs/commands/exit.md
diff --git a/old_nushell/docs/commands/fetch.md b/docs/commands/fetch.md
similarity index 100%
rename from old_nushell/docs/commands/fetch.md
rename to docs/commands/fetch.md
diff --git a/old_nushell/docs/commands/first.md b/docs/commands/first.md
similarity index 100%
rename from old_nushell/docs/commands/first.md
rename to docs/commands/first.md
diff --git a/old_nushell/docs/commands/flatten.md b/docs/commands/flatten.md
similarity index 100%
rename from old_nushell/docs/commands/flatten.md
rename to docs/commands/flatten.md
diff --git a/old_nushell/docs/commands/for.md b/docs/commands/for.md
similarity index 100%
rename from old_nushell/docs/commands/for.md
rename to docs/commands/for.md
diff --git a/old_nushell/docs/commands/format-filesize.md b/docs/commands/format-filesize.md
similarity index 100%
rename from old_nushell/docs/commands/format-filesize.md
rename to docs/commands/format-filesize.md
diff --git a/old_nushell/docs/commands/format.md b/docs/commands/format.md
similarity index 100%
rename from old_nushell/docs/commands/format.md
rename to docs/commands/format.md
diff --git a/old_nushell/docs/commands/from-bson.md b/docs/commands/from-bson.md
similarity index 100%
rename from old_nushell/docs/commands/from-bson.md
rename to docs/commands/from-bson.md
diff --git a/old_nushell/docs/commands/from-csv.md b/docs/commands/from-csv.md
similarity index 100%
rename from old_nushell/docs/commands/from-csv.md
rename to docs/commands/from-csv.md
diff --git a/old_nushell/docs/commands/from-eml.md b/docs/commands/from-eml.md
similarity index 100%
rename from old_nushell/docs/commands/from-eml.md
rename to docs/commands/from-eml.md
diff --git a/old_nushell/docs/commands/from-ics.md b/docs/commands/from-ics.md
similarity index 100%
rename from old_nushell/docs/commands/from-ics.md
rename to docs/commands/from-ics.md
diff --git a/old_nushell/docs/commands/from-ini.md b/docs/commands/from-ini.md
similarity index 100%
rename from old_nushell/docs/commands/from-ini.md
rename to docs/commands/from-ini.md
diff --git a/old_nushell/docs/commands/from-json.md b/docs/commands/from-json.md
similarity index 100%
rename from old_nushell/docs/commands/from-json.md
rename to docs/commands/from-json.md
diff --git a/old_nushell/docs/commands/from-ods.md b/docs/commands/from-ods.md
similarity index 100%
rename from old_nushell/docs/commands/from-ods.md
rename to docs/commands/from-ods.md
diff --git a/old_nushell/docs/commands/from-sqlite.md b/docs/commands/from-sqlite.md
similarity index 100%
rename from old_nushell/docs/commands/from-sqlite.md
rename to docs/commands/from-sqlite.md
diff --git a/old_nushell/docs/commands/from-ssv.md b/docs/commands/from-ssv.md
similarity index 100%
rename from old_nushell/docs/commands/from-ssv.md
rename to docs/commands/from-ssv.md
diff --git a/old_nushell/docs/commands/from-toml.md b/docs/commands/from-toml.md
similarity index 100%
rename from old_nushell/docs/commands/from-toml.md
rename to docs/commands/from-toml.md
diff --git a/old_nushell/docs/commands/from-tsv.md b/docs/commands/from-tsv.md
similarity index 100%
rename from old_nushell/docs/commands/from-tsv.md
rename to docs/commands/from-tsv.md
diff --git a/old_nushell/docs/commands/from-url.md b/docs/commands/from-url.md
similarity index 100%
rename from old_nushell/docs/commands/from-url.md
rename to docs/commands/from-url.md
diff --git a/old_nushell/docs/commands/from-vcf.md b/docs/commands/from-vcf.md
similarity index 100%
rename from old_nushell/docs/commands/from-vcf.md
rename to docs/commands/from-vcf.md
diff --git a/old_nushell/docs/commands/from-xlsx.md b/docs/commands/from-xlsx.md
similarity index 100%
rename from old_nushell/docs/commands/from-xlsx.md
rename to docs/commands/from-xlsx.md
diff --git a/old_nushell/docs/commands/from-xml.md b/docs/commands/from-xml.md
similarity index 100%
rename from old_nushell/docs/commands/from-xml.md
rename to docs/commands/from-xml.md
diff --git a/old_nushell/docs/commands/from-yaml.md b/docs/commands/from-yaml.md
similarity index 100%
rename from old_nushell/docs/commands/from-yaml.md
rename to docs/commands/from-yaml.md
diff --git a/old_nushell/docs/commands/from-yml.md b/docs/commands/from-yml.md
similarity index 100%
rename from old_nushell/docs/commands/from-yml.md
rename to docs/commands/from-yml.md
diff --git a/old_nushell/docs/commands/from.md b/docs/commands/from.md
similarity index 100%
rename from old_nushell/docs/commands/from.md
rename to docs/commands/from.md
diff --git a/old_nushell/docs/commands/get.md b/docs/commands/get.md
similarity index 100%
rename from old_nushell/docs/commands/get.md
rename to docs/commands/get.md
diff --git a/old_nushell/docs/commands/group-by-date.md b/docs/commands/group-by-date.md
similarity index 100%
rename from old_nushell/docs/commands/group-by-date.md
rename to docs/commands/group-by-date.md
diff --git a/old_nushell/docs/commands/group-by.md b/docs/commands/group-by.md
similarity index 100%
rename from old_nushell/docs/commands/group-by.md
rename to docs/commands/group-by.md
diff --git a/old_nushell/docs/commands/hash-base64.md b/docs/commands/hash-base64.md
similarity index 100%
rename from old_nushell/docs/commands/hash-base64.md
rename to docs/commands/hash-base64.md
diff --git a/old_nushell/docs/commands/hash-md5.md b/docs/commands/hash-md5.md
similarity index 100%
rename from old_nushell/docs/commands/hash-md5.md
rename to docs/commands/hash-md5.md
diff --git a/old_nushell/docs/commands/hash.md b/docs/commands/hash.md
similarity index 100%
rename from old_nushell/docs/commands/hash.md
rename to docs/commands/hash.md
diff --git a/old_nushell/docs/commands/headers.md b/docs/commands/headers.md
similarity index 100%
rename from old_nushell/docs/commands/headers.md
rename to docs/commands/headers.md
diff --git a/old_nushell/docs/commands/help.md b/docs/commands/help.md
similarity index 100%
rename from old_nushell/docs/commands/help.md
rename to docs/commands/help.md
diff --git a/old_nushell/docs/commands/histogram.md b/docs/commands/histogram.md
similarity index 100%
rename from old_nushell/docs/commands/histogram.md
rename to docs/commands/histogram.md
diff --git a/old_nushell/docs/commands/history.md b/docs/commands/history.md
similarity index 100%
rename from old_nushell/docs/commands/history.md
rename to docs/commands/history.md
diff --git a/old_nushell/docs/commands/if.md b/docs/commands/if.md
similarity index 100%
rename from old_nushell/docs/commands/if.md
rename to docs/commands/if.md
diff --git a/old_nushell/docs/commands/inc.md b/docs/commands/inc.md
similarity index 100%
rename from old_nushell/docs/commands/inc.md
rename to docs/commands/inc.md
diff --git a/old_nushell/docs/commands/insert.md b/docs/commands/insert.md
similarity index 100%
rename from old_nushell/docs/commands/insert.md
rename to docs/commands/insert.md
diff --git a/old_nushell/docs/commands/into-binary.md b/docs/commands/into-binary.md
similarity index 100%
rename from old_nushell/docs/commands/into-binary.md
rename to docs/commands/into-binary.md
diff --git a/old_nushell/docs/commands/into-int.md b/docs/commands/into-int.md
similarity index 100%
rename from old_nushell/docs/commands/into-int.md
rename to docs/commands/into-int.md
diff --git a/old_nushell/docs/commands/into-string.md b/docs/commands/into-string.md
similarity index 100%
rename from old_nushell/docs/commands/into-string.md
rename to docs/commands/into-string.md
diff --git a/old_nushell/docs/commands/into.md b/docs/commands/into.md
similarity index 100%
rename from old_nushell/docs/commands/into.md
rename to docs/commands/into.md
diff --git a/old_nushell/docs/commands/keep-until.md b/docs/commands/keep-until.md
similarity index 100%
rename from old_nushell/docs/commands/keep-until.md
rename to docs/commands/keep-until.md
diff --git a/old_nushell/docs/commands/keep-while.md b/docs/commands/keep-while.md
similarity index 100%
rename from old_nushell/docs/commands/keep-while.md
rename to docs/commands/keep-while.md
diff --git a/old_nushell/docs/commands/keep.md b/docs/commands/keep.md
similarity index 100%
rename from old_nushell/docs/commands/keep.md
rename to docs/commands/keep.md
diff --git a/old_nushell/docs/commands/kill.md b/docs/commands/kill.md
similarity index 100%
rename from old_nushell/docs/commands/kill.md
rename to docs/commands/kill.md
diff --git a/old_nushell/docs/commands/last.md b/docs/commands/last.md
similarity index 100%
rename from old_nushell/docs/commands/last.md
rename to docs/commands/last.md
diff --git a/old_nushell/docs/commands/length.md b/docs/commands/length.md
similarity index 100%
rename from old_nushell/docs/commands/length.md
rename to docs/commands/length.md
diff --git a/old_nushell/docs/commands/let-env.md b/docs/commands/let-env.md
similarity index 100%
rename from old_nushell/docs/commands/let-env.md
rename to docs/commands/let-env.md
diff --git a/old_nushell/docs/commands/let.md b/docs/commands/let.md
similarity index 100%
rename from old_nushell/docs/commands/let.md
rename to docs/commands/let.md
diff --git a/old_nushell/docs/commands/lines.md b/docs/commands/lines.md
similarity index 100%
rename from old_nushell/docs/commands/lines.md
rename to docs/commands/lines.md
diff --git a/old_nushell/docs/commands/load-env.md b/docs/commands/load-env.md
similarity index 100%
rename from old_nushell/docs/commands/load-env.md
rename to docs/commands/load-env.md
diff --git a/old_nushell/docs/commands/ls.md b/docs/commands/ls.md
similarity index 100%
rename from old_nushell/docs/commands/ls.md
rename to docs/commands/ls.md
diff --git a/old_nushell/docs/commands/match.md b/docs/commands/match.md
similarity index 100%
rename from old_nushell/docs/commands/match.md
rename to docs/commands/match.md
diff --git a/old_nushell/docs/commands/math-abs.md b/docs/commands/math-abs.md
similarity index 100%
rename from old_nushell/docs/commands/math-abs.md
rename to docs/commands/math-abs.md
diff --git a/old_nushell/docs/commands/math-avg.md b/docs/commands/math-avg.md
similarity index 100%
rename from old_nushell/docs/commands/math-avg.md
rename to docs/commands/math-avg.md
diff --git a/old_nushell/docs/commands/math-ceil.md b/docs/commands/math-ceil.md
similarity index 100%
rename from old_nushell/docs/commands/math-ceil.md
rename to docs/commands/math-ceil.md
diff --git a/old_nushell/docs/commands/math-eval.md b/docs/commands/math-eval.md
similarity index 100%
rename from old_nushell/docs/commands/math-eval.md
rename to docs/commands/math-eval.md
diff --git a/old_nushell/docs/commands/math-floor.md b/docs/commands/math-floor.md
similarity index 100%
rename from old_nushell/docs/commands/math-floor.md
rename to docs/commands/math-floor.md
diff --git a/old_nushell/docs/commands/math-max.md b/docs/commands/math-max.md
similarity index 100%
rename from old_nushell/docs/commands/math-max.md
rename to docs/commands/math-max.md
diff --git a/old_nushell/docs/commands/math-median.md b/docs/commands/math-median.md
similarity index 100%
rename from old_nushell/docs/commands/math-median.md
rename to docs/commands/math-median.md
diff --git a/old_nushell/docs/commands/math-min.md b/docs/commands/math-min.md
similarity index 100%
rename from old_nushell/docs/commands/math-min.md
rename to docs/commands/math-min.md
diff --git a/old_nushell/docs/commands/math-mode.md b/docs/commands/math-mode.md
similarity index 100%
rename from old_nushell/docs/commands/math-mode.md
rename to docs/commands/math-mode.md
diff --git a/old_nushell/docs/commands/math-product.md b/docs/commands/math-product.md
similarity index 100%
rename from old_nushell/docs/commands/math-product.md
rename to docs/commands/math-product.md
diff --git a/old_nushell/docs/commands/math-round.md b/docs/commands/math-round.md
similarity index 100%
rename from old_nushell/docs/commands/math-round.md
rename to docs/commands/math-round.md
diff --git a/old_nushell/docs/commands/math-sqrt.md b/docs/commands/math-sqrt.md
similarity index 100%
rename from old_nushell/docs/commands/math-sqrt.md
rename to docs/commands/math-sqrt.md
diff --git a/old_nushell/docs/commands/math-stddev.md b/docs/commands/math-stddev.md
similarity index 100%
rename from old_nushell/docs/commands/math-stddev.md
rename to docs/commands/math-stddev.md
diff --git a/old_nushell/docs/commands/math-sum.md b/docs/commands/math-sum.md
similarity index 100%
rename from old_nushell/docs/commands/math-sum.md
rename to docs/commands/math-sum.md
diff --git a/old_nushell/docs/commands/math-variance.md b/docs/commands/math-variance.md
similarity index 100%
rename from old_nushell/docs/commands/math-variance.md
rename to docs/commands/math-variance.md
diff --git a/old_nushell/docs/commands/math.md b/docs/commands/math.md
similarity index 100%
rename from old_nushell/docs/commands/math.md
rename to docs/commands/math.md
diff --git a/old_nushell/docs/commands/merge.md b/docs/commands/merge.md
similarity index 100%
rename from old_nushell/docs/commands/merge.md
rename to docs/commands/merge.md
diff --git a/old_nushell/docs/commands/mkdir.md b/docs/commands/mkdir.md
similarity index 100%
rename from old_nushell/docs/commands/mkdir.md
rename to docs/commands/mkdir.md
diff --git a/old_nushell/docs/commands/move.md b/docs/commands/move.md
similarity index 100%
rename from old_nushell/docs/commands/move.md
rename to docs/commands/move.md
diff --git a/old_nushell/docs/commands/mv.md b/docs/commands/mv.md
similarity index 100%
rename from old_nushell/docs/commands/mv.md
rename to docs/commands/mv.md
diff --git a/old_nushell/docs/commands/n.md b/docs/commands/n.md
similarity index 100%
rename from old_nushell/docs/commands/n.md
rename to docs/commands/n.md
diff --git a/old_nushell/docs/commands/nth.md b/docs/commands/nth.md
similarity index 100%
rename from old_nushell/docs/commands/nth.md
rename to docs/commands/nth.md
diff --git a/old_nushell/docs/commands/open.md b/docs/commands/open.md
similarity index 100%
rename from old_nushell/docs/commands/open.md
rename to docs/commands/open.md
diff --git a/old_nushell/docs/commands/p.md b/docs/commands/p.md
similarity index 100%
rename from old_nushell/docs/commands/p.md
rename to docs/commands/p.md
diff --git a/old_nushell/docs/commands/parse.md b/docs/commands/parse.md
similarity index 100%
rename from old_nushell/docs/commands/parse.md
rename to docs/commands/parse.md
diff --git a/old_nushell/docs/commands/path-basename.md b/docs/commands/path-basename.md
similarity index 100%
rename from old_nushell/docs/commands/path-basename.md
rename to docs/commands/path-basename.md
diff --git a/old_nushell/docs/commands/path-dirname.md b/docs/commands/path-dirname.md
similarity index 100%
rename from old_nushell/docs/commands/path-dirname.md
rename to docs/commands/path-dirname.md
diff --git a/old_nushell/docs/commands/path-exists.md b/docs/commands/path-exists.md
similarity index 100%
rename from old_nushell/docs/commands/path-exists.md
rename to docs/commands/path-exists.md
diff --git a/old_nushell/docs/commands/path-expand.md b/docs/commands/path-expand.md
similarity index 100%
rename from old_nushell/docs/commands/path-expand.md
rename to docs/commands/path-expand.md
diff --git a/old_nushell/docs/commands/path-join.md b/docs/commands/path-join.md
similarity index 100%
rename from old_nushell/docs/commands/path-join.md
rename to docs/commands/path-join.md
diff --git a/old_nushell/docs/commands/path-parse.md b/docs/commands/path-parse.md
similarity index 100%
rename from old_nushell/docs/commands/path-parse.md
rename to docs/commands/path-parse.md
diff --git a/old_nushell/docs/commands/path-relative-to.md b/docs/commands/path-relative-to.md
similarity index 100%
rename from old_nushell/docs/commands/path-relative-to.md
rename to docs/commands/path-relative-to.md
diff --git a/old_nushell/docs/commands/path-split.md b/docs/commands/path-split.md
similarity index 100%
rename from old_nushell/docs/commands/path-split.md
rename to docs/commands/path-split.md
diff --git a/old_nushell/docs/commands/path-type.md b/docs/commands/path-type.md
similarity index 100%
rename from old_nushell/docs/commands/path-type.md
rename to docs/commands/path-type.md
diff --git a/old_nushell/docs/commands/path.md b/docs/commands/path.md
similarity index 100%
rename from old_nushell/docs/commands/path.md
rename to docs/commands/path.md
diff --git a/old_nushell/docs/commands/pivot.md b/docs/commands/pivot.md
similarity index 100%
rename from old_nushell/docs/commands/pivot.md
rename to docs/commands/pivot.md
diff --git a/old_nushell/docs/commands/post.md b/docs/commands/post.md
similarity index 100%
rename from old_nushell/docs/commands/post.md
rename to docs/commands/post.md
diff --git a/old_nushell/docs/commands/prepend.md b/docs/commands/prepend.md
similarity index 100%
rename from old_nushell/docs/commands/prepend.md
rename to docs/commands/prepend.md
diff --git a/old_nushell/docs/commands/ps.md b/docs/commands/ps.md
similarity index 100%
rename from old_nushell/docs/commands/ps.md
rename to docs/commands/ps.md
diff --git a/old_nushell/docs/commands/pwd.md b/docs/commands/pwd.md
similarity index 100%
rename from old_nushell/docs/commands/pwd.md
rename to docs/commands/pwd.md
diff --git a/old_nushell/docs/commands/random-bool.md b/docs/commands/random-bool.md
similarity index 100%
rename from old_nushell/docs/commands/random-bool.md
rename to docs/commands/random-bool.md
diff --git a/old_nushell/docs/commands/random-chars.md b/docs/commands/random-chars.md
similarity index 100%
rename from old_nushell/docs/commands/random-chars.md
rename to docs/commands/random-chars.md
diff --git a/old_nushell/docs/commands/random-decimal.md b/docs/commands/random-decimal.md
similarity index 100%
rename from old_nushell/docs/commands/random-decimal.md
rename to docs/commands/random-decimal.md
diff --git a/old_nushell/docs/commands/random-dice.md b/docs/commands/random-dice.md
similarity index 100%
rename from old_nushell/docs/commands/random-dice.md
rename to docs/commands/random-dice.md
diff --git a/old_nushell/docs/commands/random-integer.md b/docs/commands/random-integer.md
similarity index 100%
rename from old_nushell/docs/commands/random-integer.md
rename to docs/commands/random-integer.md
diff --git a/old_nushell/docs/commands/random-uuid.md b/docs/commands/random-uuid.md
similarity index 100%
rename from old_nushell/docs/commands/random-uuid.md
rename to docs/commands/random-uuid.md
diff --git a/old_nushell/docs/commands/random.md b/docs/commands/random.md
similarity index 100%
rename from old_nushell/docs/commands/random.md
rename to docs/commands/random.md
diff --git a/old_nushell/docs/commands/range.md b/docs/commands/range.md
similarity index 100%
rename from old_nushell/docs/commands/range.md
rename to docs/commands/range.md
diff --git a/old_nushell/docs/commands/reduce.md b/docs/commands/reduce.md
similarity index 100%
rename from old_nushell/docs/commands/reduce.md
rename to docs/commands/reduce.md
diff --git a/old_nushell/docs/commands/reject.md b/docs/commands/reject.md
similarity index 100%
rename from old_nushell/docs/commands/reject.md
rename to docs/commands/reject.md
diff --git a/old_nushell/docs/commands/rename.md b/docs/commands/rename.md
similarity index 100%
rename from old_nushell/docs/commands/rename.md
rename to docs/commands/rename.md
diff --git a/old_nushell/docs/commands/reverse.md b/docs/commands/reverse.md
similarity index 100%
rename from old_nushell/docs/commands/reverse.md
rename to docs/commands/reverse.md
diff --git a/old_nushell/docs/commands/rm.md b/docs/commands/rm.md
similarity index 100%
rename from old_nushell/docs/commands/rm.md
rename to docs/commands/rm.md
diff --git a/old_nushell/docs/commands/roll-column.md b/docs/commands/roll-column.md
similarity index 100%
rename from old_nushell/docs/commands/roll-column.md
rename to docs/commands/roll-column.md
diff --git a/old_nushell/docs/commands/roll-up.md b/docs/commands/roll-up.md
similarity index 100%
rename from old_nushell/docs/commands/roll-up.md
rename to docs/commands/roll-up.md
diff --git a/old_nushell/docs/commands/roll.md b/docs/commands/roll.md
similarity index 100%
rename from old_nushell/docs/commands/roll.md
rename to docs/commands/roll.md
diff --git a/old_nushell/docs/commands/rotate-counter-clockwise.md b/docs/commands/rotate-counter-clockwise.md
similarity index 100%
rename from old_nushell/docs/commands/rotate-counter-clockwise.md
rename to docs/commands/rotate-counter-clockwise.md
diff --git a/old_nushell/docs/commands/rotate.md b/docs/commands/rotate.md
similarity index 100%
rename from old_nushell/docs/commands/rotate.md
rename to docs/commands/rotate.md
diff --git a/old_nushell/docs/commands/s3.md b/docs/commands/s3.md
similarity index 100%
rename from old_nushell/docs/commands/s3.md
rename to docs/commands/s3.md
diff --git a/old_nushell/docs/commands/save.md b/docs/commands/save.md
similarity index 100%
rename from old_nushell/docs/commands/save.md
rename to docs/commands/save.md
diff --git a/old_nushell/docs/commands/select.md b/docs/commands/select.md
similarity index 100%
rename from old_nushell/docs/commands/select.md
rename to docs/commands/select.md
diff --git a/old_nushell/docs/commands/selector.md b/docs/commands/selector.md
similarity index 100%
rename from old_nushell/docs/commands/selector.md
rename to docs/commands/selector.md
diff --git a/old_nushell/docs/commands/seq-date.md b/docs/commands/seq-date.md
similarity index 100%
rename from old_nushell/docs/commands/seq-date.md
rename to docs/commands/seq-date.md
diff --git a/old_nushell/docs/commands/seq.md b/docs/commands/seq.md
similarity index 100%
rename from old_nushell/docs/commands/seq.md
rename to docs/commands/seq.md
diff --git a/old_nushell/docs/commands/shells.md b/docs/commands/shells.md
similarity index 100%
rename from old_nushell/docs/commands/shells.md
rename to docs/commands/shells.md
diff --git a/old_nushell/docs/commands/shuffle.md b/docs/commands/shuffle.md
similarity index 100%
rename from old_nushell/docs/commands/shuffle.md
rename to docs/commands/shuffle.md
diff --git a/old_nushell/docs/commands/size.md b/docs/commands/size.md
similarity index 100%
rename from old_nushell/docs/commands/size.md
rename to docs/commands/size.md
diff --git a/old_nushell/docs/commands/skip-until.md b/docs/commands/skip-until.md
similarity index 100%
rename from old_nushell/docs/commands/skip-until.md
rename to docs/commands/skip-until.md
diff --git a/old_nushell/docs/commands/skip-while.md b/docs/commands/skip-while.md
similarity index 100%
rename from old_nushell/docs/commands/skip-while.md
rename to docs/commands/skip-while.md
diff --git a/old_nushell/docs/commands/skip.md b/docs/commands/skip.md
similarity index 100%
rename from old_nushell/docs/commands/skip.md
rename to docs/commands/skip.md
diff --git a/old_nushell/docs/commands/sleep.md b/docs/commands/sleep.md
similarity index 100%
rename from old_nushell/docs/commands/sleep.md
rename to docs/commands/sleep.md
diff --git a/old_nushell/docs/commands/sort-by.md b/docs/commands/sort-by.md
similarity index 100%
rename from old_nushell/docs/commands/sort-by.md
rename to docs/commands/sort-by.md
diff --git a/old_nushell/docs/commands/source.md b/docs/commands/source.md
similarity index 100%
rename from old_nushell/docs/commands/source.md
rename to docs/commands/source.md
diff --git a/old_nushell/docs/commands/split-by.md b/docs/commands/split-by.md
similarity index 100%
rename from old_nushell/docs/commands/split-by.md
rename to docs/commands/split-by.md
diff --git a/old_nushell/docs/commands/split-chars.md b/docs/commands/split-chars.md
similarity index 100%
rename from old_nushell/docs/commands/split-chars.md
rename to docs/commands/split-chars.md
diff --git a/old_nushell/docs/commands/split-column.md b/docs/commands/split-column.md
similarity index 100%
rename from old_nushell/docs/commands/split-column.md
rename to docs/commands/split-column.md
diff --git a/old_nushell/docs/commands/split-row.md b/docs/commands/split-row.md
similarity index 100%
rename from old_nushell/docs/commands/split-row.md
rename to docs/commands/split-row.md
diff --git a/old_nushell/docs/commands/split.md b/docs/commands/split.md
similarity index 100%
rename from old_nushell/docs/commands/split.md
rename to docs/commands/split.md
diff --git a/old_nushell/docs/commands/start.md b/docs/commands/start.md
similarity index 100%
rename from old_nushell/docs/commands/start.md
rename to docs/commands/start.md
diff --git a/old_nushell/docs/commands/str-camel-case.md b/docs/commands/str-camel-case.md
similarity index 100%
rename from old_nushell/docs/commands/str-camel-case.md
rename to docs/commands/str-camel-case.md
diff --git a/old_nushell/docs/commands/str-capitalize.md b/docs/commands/str-capitalize.md
similarity index 100%
rename from old_nushell/docs/commands/str-capitalize.md
rename to docs/commands/str-capitalize.md
diff --git a/old_nushell/docs/commands/str-collect.md b/docs/commands/str-collect.md
similarity index 100%
rename from old_nushell/docs/commands/str-collect.md
rename to docs/commands/str-collect.md
diff --git a/old_nushell/docs/commands/str-contains.md b/docs/commands/str-contains.md
similarity index 100%
rename from old_nushell/docs/commands/str-contains.md
rename to docs/commands/str-contains.md
diff --git a/old_nushell/docs/commands/str-downcase.md b/docs/commands/str-downcase.md
similarity index 100%
rename from old_nushell/docs/commands/str-downcase.md
rename to docs/commands/str-downcase.md
diff --git a/old_nushell/docs/commands/str-ends-with.md b/docs/commands/str-ends-with.md
similarity index 100%
rename from old_nushell/docs/commands/str-ends-with.md
rename to docs/commands/str-ends-with.md
diff --git a/old_nushell/docs/commands/str-find-replace.md b/docs/commands/str-find-replace.md
similarity index 100%
rename from old_nushell/docs/commands/str-find-replace.md
rename to docs/commands/str-find-replace.md
diff --git a/old_nushell/docs/commands/str-index-of.md b/docs/commands/str-index-of.md
similarity index 100%
rename from old_nushell/docs/commands/str-index-of.md
rename to docs/commands/str-index-of.md
diff --git a/old_nushell/docs/commands/str-kebab-case.md b/docs/commands/str-kebab-case.md
similarity index 100%
rename from old_nushell/docs/commands/str-kebab-case.md
rename to docs/commands/str-kebab-case.md
diff --git a/old_nushell/docs/commands/str-length.md b/docs/commands/str-length.md
similarity index 100%
rename from old_nushell/docs/commands/str-length.md
rename to docs/commands/str-length.md
diff --git a/old_nushell/docs/commands/str-lpad.md b/docs/commands/str-lpad.md
similarity index 100%
rename from old_nushell/docs/commands/str-lpad.md
rename to docs/commands/str-lpad.md
diff --git a/old_nushell/docs/commands/str-ltrim.md b/docs/commands/str-ltrim.md
similarity index 100%
rename from old_nushell/docs/commands/str-ltrim.md
rename to docs/commands/str-ltrim.md
diff --git a/old_nushell/docs/commands/str-pascal-case.md b/docs/commands/str-pascal-case.md
similarity index 100%
rename from old_nushell/docs/commands/str-pascal-case.md
rename to docs/commands/str-pascal-case.md
diff --git a/old_nushell/docs/commands/str-reverse.md b/docs/commands/str-reverse.md
similarity index 100%
rename from old_nushell/docs/commands/str-reverse.md
rename to docs/commands/str-reverse.md
diff --git a/old_nushell/docs/commands/str-rpad.md b/docs/commands/str-rpad.md
similarity index 100%
rename from old_nushell/docs/commands/str-rpad.md
rename to docs/commands/str-rpad.md
diff --git a/old_nushell/docs/commands/str-rtrim.md b/docs/commands/str-rtrim.md
similarity index 100%
rename from old_nushell/docs/commands/str-rtrim.md
rename to docs/commands/str-rtrim.md
diff --git a/old_nushell/docs/commands/str-screaming-snake-case.md b/docs/commands/str-screaming-snake-case.md
similarity index 100%
rename from old_nushell/docs/commands/str-screaming-snake-case.md
rename to docs/commands/str-screaming-snake-case.md
diff --git a/old_nushell/docs/commands/str-snake-case.md b/docs/commands/str-snake-case.md
similarity index 100%
rename from old_nushell/docs/commands/str-snake-case.md
rename to docs/commands/str-snake-case.md
diff --git a/old_nushell/docs/commands/str-starts-with.md b/docs/commands/str-starts-with.md
similarity index 100%
rename from old_nushell/docs/commands/str-starts-with.md
rename to docs/commands/str-starts-with.md
diff --git a/old_nushell/docs/commands/str-substring.md b/docs/commands/str-substring.md
similarity index 100%
rename from old_nushell/docs/commands/str-substring.md
rename to docs/commands/str-substring.md
diff --git a/old_nushell/docs/commands/str-to-datetime.md b/docs/commands/str-to-datetime.md
similarity index 100%
rename from old_nushell/docs/commands/str-to-datetime.md
rename to docs/commands/str-to-datetime.md
diff --git a/old_nushell/docs/commands/str-to-decimal.md b/docs/commands/str-to-decimal.md
similarity index 100%
rename from old_nushell/docs/commands/str-to-decimal.md
rename to docs/commands/str-to-decimal.md
diff --git a/old_nushell/docs/commands/str-to-int.md b/docs/commands/str-to-int.md
similarity index 100%
rename from old_nushell/docs/commands/str-to-int.md
rename to docs/commands/str-to-int.md
diff --git a/old_nushell/docs/commands/str-trim.md b/docs/commands/str-trim.md
similarity index 100%
rename from old_nushell/docs/commands/str-trim.md
rename to docs/commands/str-trim.md
diff --git a/old_nushell/docs/commands/str-upcase.md b/docs/commands/str-upcase.md
similarity index 100%
rename from old_nushell/docs/commands/str-upcase.md
rename to docs/commands/str-upcase.md
diff --git a/old_nushell/docs/commands/str.md b/docs/commands/str.md
similarity index 100%
rename from old_nushell/docs/commands/str.md
rename to docs/commands/str.md
diff --git a/old_nushell/docs/commands/sys.md b/docs/commands/sys.md
similarity index 100%
rename from old_nushell/docs/commands/sys.md
rename to docs/commands/sys.md
diff --git a/old_nushell/docs/commands/table.md b/docs/commands/table.md
similarity index 100%
rename from old_nushell/docs/commands/table.md
rename to docs/commands/table.md
diff --git a/old_nushell/docs/commands/tags.md b/docs/commands/tags.md
similarity index 100%
rename from old_nushell/docs/commands/tags.md
rename to docs/commands/tags.md
diff --git a/old_nushell/docs/commands/textview.md b/docs/commands/textview.md
similarity index 100%
rename from old_nushell/docs/commands/textview.md
rename to docs/commands/textview.md
diff --git a/old_nushell/docs/commands/textview_config.md b/docs/commands/textview_config.md
similarity index 100%
rename from old_nushell/docs/commands/textview_config.md
rename to docs/commands/textview_config.md
diff --git a/old_nushell/docs/commands/to-bson.md b/docs/commands/to-bson.md
similarity index 100%
rename from old_nushell/docs/commands/to-bson.md
rename to docs/commands/to-bson.md
diff --git a/old_nushell/docs/commands/to-csv.md b/docs/commands/to-csv.md
similarity index 100%
rename from old_nushell/docs/commands/to-csv.md
rename to docs/commands/to-csv.md
diff --git a/old_nushell/docs/commands/to-html.md b/docs/commands/to-html.md
similarity index 100%
rename from old_nushell/docs/commands/to-html.md
rename to docs/commands/to-html.md
diff --git a/old_nushell/docs/commands/to-json.md b/docs/commands/to-json.md
similarity index 100%
rename from old_nushell/docs/commands/to-json.md
rename to docs/commands/to-json.md
diff --git a/old_nushell/docs/commands/to-md.md b/docs/commands/to-md.md
similarity index 100%
rename from old_nushell/docs/commands/to-md.md
rename to docs/commands/to-md.md
diff --git a/old_nushell/docs/commands/to-sqlite.md b/docs/commands/to-sqlite.md
similarity index 100%
rename from old_nushell/docs/commands/to-sqlite.md
rename to docs/commands/to-sqlite.md
diff --git a/old_nushell/docs/commands/to-toml.md b/docs/commands/to-toml.md
similarity index 100%
rename from old_nushell/docs/commands/to-toml.md
rename to docs/commands/to-toml.md
diff --git a/old_nushell/docs/commands/to-tsv.md b/docs/commands/to-tsv.md
similarity index 100%
rename from old_nushell/docs/commands/to-tsv.md
rename to docs/commands/to-tsv.md
diff --git a/old_nushell/docs/commands/to-url.md b/docs/commands/to-url.md
similarity index 100%
rename from old_nushell/docs/commands/to-url.md
rename to docs/commands/to-url.md
diff --git a/old_nushell/docs/commands/to-xml.md b/docs/commands/to-xml.md
similarity index 100%
rename from old_nushell/docs/commands/to-xml.md
rename to docs/commands/to-xml.md
diff --git a/old_nushell/docs/commands/to-yaml.md b/docs/commands/to-yaml.md
similarity index 100%
rename from old_nushell/docs/commands/to-yaml.md
rename to docs/commands/to-yaml.md
diff --git a/old_nushell/docs/commands/to.md b/docs/commands/to.md
similarity index 100%
rename from old_nushell/docs/commands/to.md
rename to docs/commands/to.md
diff --git a/old_nushell/docs/commands/touch.md b/docs/commands/touch.md
similarity index 100%
rename from old_nushell/docs/commands/touch.md
rename to docs/commands/touch.md
diff --git a/old_nushell/docs/commands/tree.md b/docs/commands/tree.md
similarity index 100%
rename from old_nushell/docs/commands/tree.md
rename to docs/commands/tree.md
diff --git a/old_nushell/docs/commands/uniq.md b/docs/commands/uniq.md
similarity index 100%
rename from old_nushell/docs/commands/uniq.md
rename to docs/commands/uniq.md
diff --git a/old_nushell/docs/commands/update.md b/docs/commands/update.md
similarity index 100%
rename from old_nushell/docs/commands/update.md
rename to docs/commands/update.md
diff --git a/old_nushell/docs/commands/url-host.md b/docs/commands/url-host.md
similarity index 100%
rename from old_nushell/docs/commands/url-host.md
rename to docs/commands/url-host.md
diff --git a/old_nushell/docs/commands/url-path.md b/docs/commands/url-path.md
similarity index 100%
rename from old_nushell/docs/commands/url-path.md
rename to docs/commands/url-path.md
diff --git a/old_nushell/docs/commands/url-query.md b/docs/commands/url-query.md
similarity index 100%
rename from old_nushell/docs/commands/url-query.md
rename to docs/commands/url-query.md
diff --git a/old_nushell/docs/commands/url-scheme.md b/docs/commands/url-scheme.md
similarity index 100%
rename from old_nushell/docs/commands/url-scheme.md
rename to docs/commands/url-scheme.md
diff --git a/old_nushell/docs/commands/url.md b/docs/commands/url.md
similarity index 100%
rename from old_nushell/docs/commands/url.md
rename to docs/commands/url.md
diff --git a/old_nushell/docs/commands/version.md b/docs/commands/version.md
similarity index 100%
rename from old_nushell/docs/commands/version.md
rename to docs/commands/version.md
diff --git a/old_nushell/docs/commands/where.md b/docs/commands/where.md
similarity index 100%
rename from old_nushell/docs/commands/where.md
rename to docs/commands/where.md
diff --git a/old_nushell/docs/commands/which.md b/docs/commands/which.md
similarity index 100%
rename from old_nushell/docs/commands/which.md
rename to docs/commands/which.md
diff --git a/old_nushell/docs/commands/with-env.md b/docs/commands/with-env.md
similarity index 100%
rename from old_nushell/docs/commands/with-env.md
rename to docs/commands/with-env.md
diff --git a/old_nushell/docs/commands/wrap.md b/docs/commands/wrap.md
similarity index 100%
rename from old_nushell/docs/commands/wrap.md
rename to docs/commands/wrap.md
diff --git a/old_nushell/docs/commands/xpath.md b/docs/commands/xpath.md
similarity index 100%
rename from old_nushell/docs/commands/xpath.md
rename to docs/commands/xpath.md
diff --git a/old_nushell/docs/docker.md b/docs/docker.md
similarity index 100%
rename from old_nushell/docs/docker.md
rename to docs/docker.md
diff --git a/old_nushell/docs/howto_build_without_openssl.md b/docs/howto_build_without_openssl.md
similarity index 100%
rename from old_nushell/docs/howto_build_without_openssl.md
rename to docs/howto_build_without_openssl.md
diff --git a/old_nushell/docs/howto_port_a_command_to_engine_p.md b/docs/howto_port_a_command_to_engine_p.md
similarity index 100%
rename from old_nushell/docs/howto_port_a_command_to_engine_p.md
rename to docs/howto_port_a_command_to_engine_p.md
diff --git a/old_nushell/docs/implementing_a_command.md b/docs/implementing_a_command.md
similarity index 100%
rename from old_nushell/docs/implementing_a_command.md
rename to docs/implementing_a_command.md
diff --git a/old_nushell/docs/philosophy.md b/docs/philosophy.md
similarity index 100%
rename from old_nushell/docs/philosophy.md
rename to docs/philosophy.md
diff --git a/old_nushell/docs/sample_config/config.toml b/docs/sample_config/config.toml
similarity index 100%
rename from old_nushell/docs/sample_config/config.toml
rename to docs/sample_config/config.toml
diff --git a/old_nushell/docs/sample_config/keybindings.yml b/docs/sample_config/keybindings.yml
similarity index 100%
rename from old_nushell/docs/sample_config/keybindings.yml
rename to docs/sample_config/keybindings.yml
diff --git a/old_nushell/docs/sample_config/rwb.json b/docs/sample_config/rwb.json
similarity index 100%
rename from old_nushell/docs/sample_config/rwb.json
rename to docs/sample_config/rwb.json
diff --git a/old_nushell/docs/sample_plugins/powershell/nu_plugin_mylen_filter.ps1 b/docs/sample_plugins/powershell/nu_plugin_mylen_filter.ps1
similarity index 100%
rename from old_nushell/docs/sample_plugins/powershell/nu_plugin_mylen_filter.ps1
rename to docs/sample_plugins/powershell/nu_plugin_mylen_filter.ps1
diff --git a/old_nushell/extra_features_cargo_install.sh b/extra_features_cargo_install.sh
similarity index 100%
rename from old_nushell/extra_features_cargo_install.sh
rename to extra_features_cargo_install.sh
diff --git a/old_nushell/images/nushell-autocomplete.gif b/images/nushell-autocomplete.gif
similarity index 100%
rename from old_nushell/images/nushell-autocomplete.gif
rename to images/nushell-autocomplete.gif
diff --git a/old_nushell/images/nushell-autocomplete3.gif b/images/nushell-autocomplete3.gif
similarity index 100%
rename from old_nushell/images/nushell-autocomplete3.gif
rename to images/nushell-autocomplete3.gif
diff --git a/old_nushell/images/nushell-autocomplete4.gif b/images/nushell-autocomplete4.gif
similarity index 100%
rename from old_nushell/images/nushell-autocomplete4.gif
rename to images/nushell-autocomplete4.gif
diff --git a/old_nushell/images/nushell-autocomplete5.gif b/images/nushell-autocomplete5.gif
similarity index 100%
rename from old_nushell/images/nushell-autocomplete5.gif
rename to images/nushell-autocomplete5.gif
diff --git a/old_nushell/.editorconfig b/old_nushell/.editorconfig
deleted file mode 100644
index c5d100a733..0000000000
--- a/old_nushell/.editorconfig
+++ /dev/null
@@ -1,14 +0,0 @@
-root = true
-
-[*]
-indent_style = space
-indent_size = 4
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = false
-end_of_line = lf
-
-[*.{yml,yaml}]
-indent_size = 2
-charset = utf-8
-insert_final_newline = true
\ No newline at end of file
diff --git a/old_nushell/.gitignore b/old_nushell/.gitignore
deleted file mode 100644
index 4c234e523b..0000000000
--- a/old_nushell/.gitignore
+++ /dev/null
@@ -1,22 +0,0 @@
-/target
-/scratch
-**/*.rs.bk
-history.txt
-tests/fixtures/nuplayground
-crates/*/target
-
-# Debian/Ubuntu
-debian/.debhelper/
-debian/debhelper-build-stamp
-debian/files
-debian/nu.substvars
-debian/nu/
-
-# macOS junk
-.DS_Store
-
-# JetBrains' IDE items
-.idea/*
-
-# VSCode's IDE items
-.vscode/*
diff --git a/old_nushell/Cargo.lock b/old_nushell/Cargo_old.lock
similarity index 100%
rename from old_nushell/Cargo.lock
rename to old_nushell/Cargo_old.lock
diff --git a/old_nushell/Cargo.toml b/old_nushell/Cargo_old.toml
similarity index 100%
rename from old_nushell/Cargo.toml
rename to old_nushell/Cargo_old.toml
diff --git a/old_nushell/LICENSE b/old_nushell/LICENSE
deleted file mode 100644
index 70f227d78f..0000000000
--- a/old_nushell/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2019 - 2021 Nushell Project
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/old_nushell/pkg_mgrs/winget/0.17.yml b/pkg_mgrs/winget/0.17.yml
similarity index 100%
rename from old_nushell/pkg_mgrs/winget/0.17.yml
rename to pkg_mgrs/winget/0.17.yml
diff --git a/old_nushell/rustfmt.toml b/rustfmt.toml
similarity index 100%
rename from old_nushell/rustfmt.toml
rename to rustfmt.toml
diff --git a/old_nushell/samples/wasm/.appveyor.yml b/samples/wasm/.appveyor.yml
similarity index 100%
rename from old_nushell/samples/wasm/.appveyor.yml
rename to samples/wasm/.appveyor.yml
diff --git a/old_nushell/samples/wasm/.cargo-ok b/samples/wasm/.cargo-ok
similarity index 100%
rename from old_nushell/samples/wasm/.cargo-ok
rename to samples/wasm/.cargo-ok
diff --git a/old_nushell/samples/wasm/.gitignore b/samples/wasm/.gitignore
similarity index 100%
rename from old_nushell/samples/wasm/.gitignore
rename to samples/wasm/.gitignore
diff --git a/old_nushell/samples/wasm/.travis.yml b/samples/wasm/.travis.yml
similarity index 100%
rename from old_nushell/samples/wasm/.travis.yml
rename to samples/wasm/.travis.yml
diff --git a/old_nushell/samples/wasm/Cargo.toml b/samples/wasm/Cargo.toml
similarity index 100%
rename from old_nushell/samples/wasm/Cargo.toml
rename to samples/wasm/Cargo.toml
diff --git a/old_nushell/samples/wasm/LICENSE_APACHE b/samples/wasm/LICENSE_APACHE
similarity index 100%
rename from old_nushell/samples/wasm/LICENSE_APACHE
rename to samples/wasm/LICENSE_APACHE
diff --git a/old_nushell/samples/wasm/LICENSE_MIT b/samples/wasm/LICENSE_MIT
similarity index 100%
rename from old_nushell/samples/wasm/LICENSE_MIT
rename to samples/wasm/LICENSE_MIT
diff --git a/old_nushell/samples/wasm/README.md b/samples/wasm/README.md
similarity index 100%
rename from old_nushell/samples/wasm/README.md
rename to samples/wasm/README.md
diff --git a/old_nushell/samples/wasm/package-lock.json b/samples/wasm/package-lock.json
similarity index 100%
rename from old_nushell/samples/wasm/package-lock.json
rename to samples/wasm/package-lock.json
diff --git a/old_nushell/samples/wasm/package.json b/samples/wasm/package.json
similarity index 100%
rename from old_nushell/samples/wasm/package.json
rename to samples/wasm/package.json
diff --git a/old_nushell/samples/wasm/src/lib.rs b/samples/wasm/src/lib.rs
similarity index 100%
rename from old_nushell/samples/wasm/src/lib.rs
rename to samples/wasm/src/lib.rs
diff --git a/old_nushell/samples/wasm/src/utils.rs b/samples/wasm/src/utils.rs
similarity index 100%
rename from old_nushell/samples/wasm/src/utils.rs
rename to samples/wasm/src/utils.rs
diff --git a/old_nushell/samples/wasm/tests/web.rs b/samples/wasm/tests/web.rs
similarity index 100%
rename from old_nushell/samples/wasm/tests/web.rs
rename to samples/wasm/tests/web.rs
diff --git a/old_nushell/wix/License.rtf b/wix/License.rtf
similarity index 100%
rename from old_nushell/wix/License.rtf
rename to wix/License.rtf
diff --git a/old_nushell/wix/main.wxs b/wix/main.wxs
similarity index 100%
rename from old_nushell/wix/main.wxs
rename to wix/main.wxs