diff --git a/src/uutils/uutils.rs b/src/bin/uutils.rs
similarity index 100%
rename from src/uutils/uutils.rs
rename to src/bin/uutils.rs
diff --git a/src/#common/mkmain.rs b/src/common/mkmain.rs
similarity index 100%
rename from src/#common/mkmain.rs
rename to src/common/mkmain.rs
diff --git a/src/#common/uumain.rs b/src/common/uumain.rs
similarity index 100%
rename from src/#common/uumain.rs
rename to src/common/uumain.rs
diff --git a/src/arch/Cargo.toml b/src/uu/arch/Cargo.toml
similarity index 100%
rename from src/arch/Cargo.toml
rename to src/uu/arch/Cargo.toml
diff --git a/src/arch/arch.rs b/src/uu/arch/src/arch.rs
similarity index 100%
rename from src/arch/arch.rs
rename to src/uu/arch/src/arch.rs
diff --git a/src/base32/Cargo.toml b/src/uu/base32/Cargo.toml
similarity index 100%
rename from src/base32/Cargo.toml
rename to src/uu/base32/Cargo.toml
diff --git a/src/base32/base32.rs b/src/uu/base32/src/base32.rs
similarity index 100%
rename from src/base32/base32.rs
rename to src/uu/base32/src/base32.rs
diff --git a/src/base64/Cargo.toml b/src/uu/base64/Cargo.toml
similarity index 100%
rename from src/base64/Cargo.toml
rename to src/uu/base64/Cargo.toml
diff --git a/src/base64/base64.rs b/src/uu/base64/src/base64.rs
similarity index 100%
rename from src/base64/base64.rs
rename to src/uu/base64/src/base64.rs
diff --git a/src/base64/base_common.rs b/src/uu/base64/src/base_common.rs
similarity index 100%
rename from src/base64/base_common.rs
rename to src/uu/base64/src/base_common.rs
diff --git a/src/basename/Cargo.toml b/src/uu/basename/Cargo.toml
similarity index 100%
rename from src/basename/Cargo.toml
rename to src/uu/basename/Cargo.toml
diff --git a/src/basename/basename.rs b/src/uu/basename/src/basename.rs
similarity index 100%
rename from src/basename/basename.rs
rename to src/uu/basename/src/basename.rs
diff --git a/src/cat/Cargo.toml b/src/uu/cat/Cargo.toml
similarity index 100%
rename from src/cat/Cargo.toml
rename to src/uu/cat/Cargo.toml
diff --git a/src/cat/cat.rs b/src/uu/cat/src/cat.rs
old mode 100755
new mode 100644
similarity index 100%
rename from src/cat/cat.rs
rename to src/uu/cat/src/cat.rs
diff --git a/src/chgrp/Cargo.toml b/src/uu/chgrp/Cargo.toml
similarity index 100%
rename from src/chgrp/Cargo.toml
rename to src/uu/chgrp/Cargo.toml
diff --git a/src/chgrp/chgrp.rs b/src/uu/chgrp/src/chgrp.rs
similarity index 100%
rename from src/chgrp/chgrp.rs
rename to src/uu/chgrp/src/chgrp.rs
diff --git a/src/chmod/Cargo.toml b/src/uu/chmod/Cargo.toml
similarity index 100%
rename from src/chmod/Cargo.toml
rename to src/uu/chmod/Cargo.toml
diff --git a/src/chmod/chmod.rs b/src/uu/chmod/src/chmod.rs
similarity index 100%
rename from src/chmod/chmod.rs
rename to src/uu/chmod/src/chmod.rs
diff --git a/src/chown/Cargo.toml b/src/uu/chown/Cargo.toml
similarity index 100%
rename from src/chown/Cargo.toml
rename to src/uu/chown/Cargo.toml
diff --git a/src/chown/chown.rs b/src/uu/chown/src/chown.rs
similarity index 100%
rename from src/chown/chown.rs
rename to src/uu/chown/src/chown.rs
diff --git a/src/chroot/Cargo.toml b/src/uu/chroot/Cargo.toml
similarity index 100%
rename from src/chroot/Cargo.toml
rename to src/uu/chroot/Cargo.toml
diff --git a/src/chroot/chroot.rs b/src/uu/chroot/src/chroot.rs
similarity index 100%
rename from src/chroot/chroot.rs
rename to src/uu/chroot/src/chroot.rs
diff --git a/src/cksum/Cargo.toml b/src/uu/cksum/Cargo.toml
similarity index 100%
rename from src/cksum/Cargo.toml
rename to src/uu/cksum/Cargo.toml
diff --git a/src/cksum/build.rs b/src/uu/cksum/build.rs
similarity index 100%
rename from src/cksum/build.rs
rename to src/uu/cksum/build.rs
diff --git a/src/cksum/cksum.rs b/src/uu/cksum/src/cksum.rs
similarity index 100%
rename from src/cksum/cksum.rs
rename to src/uu/cksum/src/cksum.rs
diff --git a/src/comm/Cargo.toml b/src/uu/comm/Cargo.toml
similarity index 100%
rename from src/comm/Cargo.toml
rename to src/uu/comm/Cargo.toml
diff --git a/src/comm/comm.rs b/src/uu/comm/src/comm.rs
similarity index 100%
rename from src/comm/comm.rs
rename to src/uu/comm/src/comm.rs
diff --git a/src/cp/Cargo.toml b/src/uu/cp/Cargo.toml
similarity index 100%
rename from src/cp/Cargo.toml
rename to src/uu/cp/Cargo.toml
diff --git a/src/cp/README.md b/src/uu/cp/README.md
similarity index 100%
rename from src/cp/README.md
rename to src/uu/cp/README.md
diff --git a/src/cp/cp.rs b/src/uu/cp/src/cp.rs
similarity index 100%
rename from src/cp/cp.rs
rename to src/uu/cp/src/cp.rs
diff --git a/src/cut/.gitignore b/src/uu/cut/.gitignore
similarity index 100%
rename from src/cut/.gitignore
rename to src/uu/cut/.gitignore
diff --git a/src/cut/Cargo.toml b/src/uu/cut/Cargo.toml
similarity index 100%
rename from src/cut/Cargo.toml
rename to src/uu/cut/Cargo.toml
diff --git a/src/cut/buffer.rs b/src/uu/cut/src/buffer.rs
similarity index 100%
rename from src/cut/buffer.rs
rename to src/uu/cut/src/buffer.rs
diff --git a/src/cut/cut.rs b/src/uu/cut/src/cut.rs
similarity index 100%
rename from src/cut/cut.rs
rename to src/uu/cut/src/cut.rs
diff --git a/src/cut/ranges.rs b/src/uu/cut/src/ranges.rs
similarity index 100%
rename from src/cut/ranges.rs
rename to src/uu/cut/src/ranges.rs
diff --git a/src/cut/searcher.rs b/src/uu/cut/src/searcher.rs
similarity index 100%
rename from src/cut/searcher.rs
rename to src/uu/cut/src/searcher.rs
diff --git a/src/date/Cargo.toml b/src/uu/date/Cargo.toml
similarity index 100%
rename from src/date/Cargo.toml
rename to src/uu/date/Cargo.toml
diff --git a/src/date/date.rs b/src/uu/date/src/date.rs
similarity index 100%
rename from src/date/date.rs
rename to src/uu/date/src/date.rs
diff --git a/src/date/usage.txt b/src/uu/date/usage.txt
similarity index 100%
rename from src/date/usage.txt
rename to src/uu/date/usage.txt
diff --git a/src/dircolors/Cargo.toml b/src/uu/dircolors/Cargo.toml
similarity index 100%
rename from src/dircolors/Cargo.toml
rename to src/uu/dircolors/Cargo.toml
diff --git a/src/dircolors/colors.rs b/src/uu/dircolors/src/colors.rs
similarity index 100%
rename from src/dircolors/colors.rs
rename to src/uu/dircolors/src/colors.rs
diff --git a/src/dircolors/dircolors.rs b/src/uu/dircolors/src/dircolors.rs
similarity index 100%
rename from src/dircolors/dircolors.rs
rename to src/uu/dircolors/src/dircolors.rs
diff --git a/src/dirname/Cargo.toml b/src/uu/dirname/Cargo.toml
similarity index 100%
rename from src/dirname/Cargo.toml
rename to src/uu/dirname/Cargo.toml
diff --git a/src/dirname/dirname.rs b/src/uu/dirname/src/dirname.rs
similarity index 100%
rename from src/dirname/dirname.rs
rename to src/uu/dirname/src/dirname.rs
diff --git a/src/du/Cargo.toml b/src/uu/du/Cargo.toml
similarity index 100%
rename from src/du/Cargo.toml
rename to src/uu/du/Cargo.toml
diff --git a/src/du/du.rs b/src/uu/du/src/du.rs
similarity index 100%
rename from src/du/du.rs
rename to src/uu/du/src/du.rs
diff --git a/src/echo/Cargo.toml b/src/uu/echo/Cargo.toml
similarity index 100%
rename from src/echo/Cargo.toml
rename to src/uu/echo/Cargo.toml
diff --git a/src/echo/echo.rs b/src/uu/echo/src/echo.rs
similarity index 100%
rename from src/echo/echo.rs
rename to src/uu/echo/src/echo.rs
diff --git a/src/env/Cargo.toml b/src/uu/env/Cargo.toml
similarity index 100%
rename from src/env/Cargo.toml
rename to src/uu/env/Cargo.toml
diff --git a/src/env/env.rs b/src/uu/env/src/env.rs
similarity index 100%
rename from src/env/env.rs
rename to src/uu/env/src/env.rs
diff --git a/src/expand/Cargo.toml b/src/uu/expand/Cargo.toml
similarity index 100%
rename from src/expand/Cargo.toml
rename to src/uu/expand/Cargo.toml
diff --git a/src/expand/expand.rs b/src/uu/expand/src/expand.rs
similarity index 100%
rename from src/expand/expand.rs
rename to src/uu/expand/src/expand.rs
diff --git a/src/expr/Cargo.toml b/src/uu/expr/Cargo.toml
similarity index 100%
rename from src/expr/Cargo.toml
rename to src/uu/expr/Cargo.toml
diff --git a/src/expr/expr.rs b/src/uu/expr/src/expr.rs
similarity index 100%
rename from src/expr/expr.rs
rename to src/uu/expr/src/expr.rs
diff --git a/src/expr/syntax_tree.rs b/src/uu/expr/src/syntax_tree.rs
similarity index 100%
rename from src/expr/syntax_tree.rs
rename to src/uu/expr/src/syntax_tree.rs
diff --git a/src/expr/tokens.rs b/src/uu/expr/src/tokens.rs
similarity index 100%
rename from src/expr/tokens.rs
rename to src/uu/expr/src/tokens.rs
diff --git a/src/factor/Cargo.toml b/src/uu/factor/Cargo.toml
similarity index 100%
rename from src/factor/Cargo.toml
rename to src/uu/factor/Cargo.toml
diff --git a/src/factor/build.rs b/src/uu/factor/build.rs
similarity index 100%
rename from src/factor/build.rs
rename to src/uu/factor/build.rs
diff --git a/src/factor/sieve.rs b/src/uu/factor/sieve.rs
similarity index 100%
rename from src/factor/sieve.rs
rename to src/uu/factor/sieve.rs
diff --git a/src/factor/factor.rs b/src/uu/factor/src/factor.rs
similarity index 100%
rename from src/factor/factor.rs
rename to src/uu/factor/src/factor.rs
diff --git a/src/factor/numeric.rs b/src/uu/factor/src/numeric.rs
similarity index 100%
rename from src/factor/numeric.rs
rename to src/uu/factor/src/numeric.rs
diff --git a/src/false/Cargo.toml b/src/uu/false/Cargo.toml
similarity index 100%
rename from src/false/Cargo.toml
rename to src/uu/false/Cargo.toml
diff --git a/src/false/false.rs b/src/uu/false/src/false.rs
similarity index 100%
rename from src/false/false.rs
rename to src/uu/false/src/false.rs
diff --git a/src/fmt/Cargo.toml b/src/uu/fmt/Cargo.toml
similarity index 100%
rename from src/fmt/Cargo.toml
rename to src/uu/fmt/Cargo.toml
diff --git a/src/fmt/fmt.rs b/src/uu/fmt/src/fmt.rs
similarity index 100%
rename from src/fmt/fmt.rs
rename to src/uu/fmt/src/fmt.rs
diff --git a/src/fmt/linebreak.rs b/src/uu/fmt/src/linebreak.rs
similarity index 100%
rename from src/fmt/linebreak.rs
rename to src/uu/fmt/src/linebreak.rs
diff --git a/src/fmt/parasplit.rs b/src/uu/fmt/src/parasplit.rs
similarity index 100%
rename from src/fmt/parasplit.rs
rename to src/uu/fmt/src/parasplit.rs
diff --git a/src/fold/Cargo.toml b/src/uu/fold/Cargo.toml
similarity index 100%
rename from src/fold/Cargo.toml
rename to src/uu/fold/Cargo.toml
diff --git a/src/fold/fold.rs b/src/uu/fold/src/fold.rs
similarity index 100%
rename from src/fold/fold.rs
rename to src/uu/fold/src/fold.rs
diff --git a/src/groups/Cargo.toml b/src/uu/groups/Cargo.toml
similarity index 100%
rename from src/groups/Cargo.toml
rename to src/uu/groups/Cargo.toml
diff --git a/src/groups/groups.rs b/src/uu/groups/src/groups.rs
similarity index 100%
rename from src/groups/groups.rs
rename to src/uu/groups/src/groups.rs
diff --git a/src/hashsum/Cargo.toml b/src/uu/hashsum/Cargo.toml
similarity index 100%
rename from src/hashsum/Cargo.toml
rename to src/uu/hashsum/Cargo.toml
diff --git a/src/hashsum/digest.rs b/src/uu/hashsum/src/digest.rs
similarity index 100%
rename from src/hashsum/digest.rs
rename to src/uu/hashsum/src/digest.rs
diff --git a/src/hashsum/hashsum.rs b/src/uu/hashsum/src/hashsum.rs
similarity index 100%
rename from src/hashsum/hashsum.rs
rename to src/uu/hashsum/src/hashsum.rs
diff --git a/src/head/Cargo.toml b/src/uu/head/Cargo.toml
similarity index 100%
rename from src/head/Cargo.toml
rename to src/uu/head/Cargo.toml
diff --git a/src/head/head.rs b/src/uu/head/src/head.rs
similarity index 100%
rename from src/head/head.rs
rename to src/uu/head/src/head.rs
diff --git a/src/hostid/Cargo.toml b/src/uu/hostid/Cargo.toml
similarity index 100%
rename from src/hostid/Cargo.toml
rename to src/uu/hostid/Cargo.toml
diff --git a/src/hostid/hostid.rs b/src/uu/hostid/src/hostid.rs
similarity index 100%
rename from src/hostid/hostid.rs
rename to src/uu/hostid/src/hostid.rs
diff --git a/src/hostname/Cargo.toml b/src/uu/hostname/Cargo.toml
similarity index 100%
rename from src/hostname/Cargo.toml
rename to src/uu/hostname/Cargo.toml
diff --git a/src/hostname/hostname.rs b/src/uu/hostname/src/hostname.rs
similarity index 100%
rename from src/hostname/hostname.rs
rename to src/uu/hostname/src/hostname.rs
diff --git a/src/id/Cargo.toml b/src/uu/id/Cargo.toml
similarity index 100%
rename from src/id/Cargo.toml
rename to src/uu/id/Cargo.toml
diff --git a/src/id/id.rs b/src/uu/id/src/id.rs
similarity index 100%
rename from src/id/id.rs
rename to src/uu/id/src/id.rs
diff --git a/src/install/Cargo.toml b/src/uu/install/Cargo.toml
similarity index 100%
rename from src/install/Cargo.toml
rename to src/uu/install/Cargo.toml
diff --git a/src/install/install.rs b/src/uu/install/src/install.rs
similarity index 100%
rename from src/install/install.rs
rename to src/uu/install/src/install.rs
diff --git a/src/install/mode.rs b/src/uu/install/src/mode.rs
similarity index 100%
rename from src/install/mode.rs
rename to src/uu/install/src/mode.rs
diff --git a/src/join/Cargo.toml b/src/uu/join/Cargo.toml
similarity index 100%
rename from src/join/Cargo.toml
rename to src/uu/join/Cargo.toml
diff --git a/src/join/join.rs b/src/uu/join/src/join.rs
old mode 100755
new mode 100644
similarity index 100%
rename from src/join/join.rs
rename to src/uu/join/src/join.rs
diff --git a/src/kill/Cargo.toml b/src/uu/kill/Cargo.toml
similarity index 100%
rename from src/kill/Cargo.toml
rename to src/uu/kill/Cargo.toml
diff --git a/src/kill/kill.rs b/src/uu/kill/src/kill.rs
similarity index 100%
rename from src/kill/kill.rs
rename to src/uu/kill/src/kill.rs
diff --git a/src/link/Cargo.toml b/src/uu/link/Cargo.toml
similarity index 100%
rename from src/link/Cargo.toml
rename to src/uu/link/Cargo.toml
diff --git a/src/link/link.rs b/src/uu/link/src/link.rs
similarity index 100%
rename from src/link/link.rs
rename to src/uu/link/src/link.rs
diff --git a/src/ln/Cargo.toml b/src/uu/ln/Cargo.toml
similarity index 100%
rename from src/ln/Cargo.toml
rename to src/uu/ln/Cargo.toml
diff --git a/src/ln/ln.rs b/src/uu/ln/src/ln.rs
similarity index 100%
rename from src/ln/ln.rs
rename to src/uu/ln/src/ln.rs
diff --git a/src/logname/Cargo.toml b/src/uu/logname/Cargo.toml
similarity index 100%
rename from src/logname/Cargo.toml
rename to src/uu/logname/Cargo.toml
diff --git a/src/logname/logname.rs b/src/uu/logname/src/logname.rs
similarity index 100%
rename from src/logname/logname.rs
rename to src/uu/logname/src/logname.rs
diff --git a/src/ls/Cargo.toml b/src/uu/ls/Cargo.toml
similarity index 100%
rename from src/ls/Cargo.toml
rename to src/uu/ls/Cargo.toml
diff --git a/src/ls/ls.rs b/src/uu/ls/src/ls.rs
similarity index 100%
rename from src/ls/ls.rs
rename to src/uu/ls/src/ls.rs
diff --git a/src/mkdir/Cargo.toml b/src/uu/mkdir/Cargo.toml
similarity index 100%
rename from src/mkdir/Cargo.toml
rename to src/uu/mkdir/Cargo.toml
diff --git a/src/mkdir/mkdir.rs b/src/uu/mkdir/src/mkdir.rs
similarity index 100%
rename from src/mkdir/mkdir.rs
rename to src/uu/mkdir/src/mkdir.rs
diff --git a/src/mkfifo/Cargo.toml b/src/uu/mkfifo/Cargo.toml
similarity index 100%
rename from src/mkfifo/Cargo.toml
rename to src/uu/mkfifo/Cargo.toml
diff --git a/src/mkfifo/mkfifo.rs b/src/uu/mkfifo/src/mkfifo.rs
similarity index 100%
rename from src/mkfifo/mkfifo.rs
rename to src/uu/mkfifo/src/mkfifo.rs
diff --git a/src/mknod/Cargo.toml b/src/uu/mknod/Cargo.toml
similarity index 100%
rename from src/mknod/Cargo.toml
rename to src/uu/mknod/Cargo.toml
diff --git a/src/mknod/mknod.rs b/src/uu/mknod/src/mknod.rs
similarity index 100%
rename from src/mknod/mknod.rs
rename to src/uu/mknod/src/mknod.rs
diff --git a/src/mknod/parsemode.rs b/src/uu/mknod/src/parsemode.rs
similarity index 100%
rename from src/mknod/parsemode.rs
rename to src/uu/mknod/src/parsemode.rs
diff --git a/src/mktemp/Cargo.toml b/src/uu/mktemp/Cargo.toml
similarity index 100%
rename from src/mktemp/Cargo.toml
rename to src/uu/mktemp/Cargo.toml
diff --git a/src/mktemp/mktemp.rs b/src/uu/mktemp/src/mktemp.rs
similarity index 100%
rename from src/mktemp/mktemp.rs
rename to src/uu/mktemp/src/mktemp.rs
diff --git a/src/mktemp/tempdir.rs b/src/uu/mktemp/src/tempdir.rs
similarity index 100%
rename from src/mktemp/tempdir.rs
rename to src/uu/mktemp/src/tempdir.rs
diff --git a/src/more/Cargo.toml b/src/uu/more/Cargo.toml
similarity index 100%
rename from src/more/Cargo.toml
rename to src/uu/more/Cargo.toml
diff --git a/src/more/more.rs b/src/uu/more/src/more.rs
similarity index 100%
rename from src/more/more.rs
rename to src/uu/more/src/more.rs
diff --git a/src/mv/Cargo.toml b/src/uu/mv/Cargo.toml
similarity index 100%
rename from src/mv/Cargo.toml
rename to src/uu/mv/Cargo.toml
diff --git a/src/mv/mv.rs b/src/uu/mv/src/mv.rs
similarity index 100%
rename from src/mv/mv.rs
rename to src/uu/mv/src/mv.rs
diff --git a/src/nice/Cargo.toml b/src/uu/nice/Cargo.toml
similarity index 100%
rename from src/nice/Cargo.toml
rename to src/uu/nice/Cargo.toml
diff --git a/src/nice/nice.rs b/src/uu/nice/src/nice.rs
similarity index 100%
rename from src/nice/nice.rs
rename to src/uu/nice/src/nice.rs
diff --git a/src/nl/Cargo.toml b/src/uu/nl/Cargo.toml
similarity index 100%
rename from src/nl/Cargo.toml
rename to src/uu/nl/Cargo.toml
diff --git a/src/nl/helper.rs b/src/uu/nl/src/helper.rs
similarity index 100%
rename from src/nl/helper.rs
rename to src/uu/nl/src/helper.rs
diff --git a/src/nl/nl.rs b/src/uu/nl/src/nl.rs
similarity index 100%
rename from src/nl/nl.rs
rename to src/uu/nl/src/nl.rs
diff --git a/src/nohup/Cargo.toml b/src/uu/nohup/Cargo.toml
similarity index 100%
rename from src/nohup/Cargo.toml
rename to src/uu/nohup/Cargo.toml
diff --git a/src/nohup/nohup.rs b/src/uu/nohup/src/nohup.rs
similarity index 100%
rename from src/nohup/nohup.rs
rename to src/uu/nohup/src/nohup.rs
diff --git a/src/nproc/Cargo.toml b/src/uu/nproc/Cargo.toml
similarity index 100%
rename from src/nproc/Cargo.toml
rename to src/uu/nproc/Cargo.toml
diff --git a/src/nproc/nproc.rs b/src/uu/nproc/src/nproc.rs
similarity index 100%
rename from src/nproc/nproc.rs
rename to src/uu/nproc/src/nproc.rs
diff --git a/src/numfmt/Cargo.toml b/src/uu/numfmt/Cargo.toml
similarity index 100%
rename from src/numfmt/Cargo.toml
rename to src/uu/numfmt/Cargo.toml
diff --git a/src/numfmt/numfmt.rs b/src/uu/numfmt/src/numfmt.rs
similarity index 100%
rename from src/numfmt/numfmt.rs
rename to src/uu/numfmt/src/numfmt.rs
diff --git a/src/od/Cargo.toml b/src/uu/od/Cargo.toml
similarity index 100%
rename from src/od/Cargo.toml
rename to src/uu/od/Cargo.toml
diff --git a/src/od/byteorder_io.rs b/src/uu/od/src/byteorder_io.rs
similarity index 100%
rename from src/od/byteorder_io.rs
rename to src/uu/od/src/byteorder_io.rs
diff --git a/src/od/formatteriteminfo.rs b/src/uu/od/src/formatteriteminfo.rs
similarity index 100%
rename from src/od/formatteriteminfo.rs
rename to src/uu/od/src/formatteriteminfo.rs
diff --git a/src/od/inputdecoder.rs b/src/uu/od/src/inputdecoder.rs
similarity index 100%
rename from src/od/inputdecoder.rs
rename to src/uu/od/src/inputdecoder.rs
diff --git a/src/od/inputoffset.rs b/src/uu/od/src/inputoffset.rs
similarity index 100%
rename from src/od/inputoffset.rs
rename to src/uu/od/src/inputoffset.rs
diff --git a/src/od/mockstream.rs b/src/uu/od/src/mockstream.rs
similarity index 100%
rename from src/od/mockstream.rs
rename to src/uu/od/src/mockstream.rs
diff --git a/src/od/multifilereader.rs b/src/uu/od/src/multifilereader.rs
similarity index 100%
rename from src/od/multifilereader.rs
rename to src/uu/od/src/multifilereader.rs
diff --git a/src/od/od.rs b/src/uu/od/src/od.rs
similarity index 100%
rename from src/od/od.rs
rename to src/uu/od/src/od.rs
diff --git a/src/od/output_info.rs b/src/uu/od/src/output_info.rs
similarity index 100%
rename from src/od/output_info.rs
rename to src/uu/od/src/output_info.rs
diff --git a/src/od/parse_formats.rs b/src/uu/od/src/parse_formats.rs
similarity index 100%
rename from src/od/parse_formats.rs
rename to src/uu/od/src/parse_formats.rs
diff --git a/src/od/parse_inputs.rs b/src/uu/od/src/parse_inputs.rs
similarity index 100%
rename from src/od/parse_inputs.rs
rename to src/uu/od/src/parse_inputs.rs
diff --git a/src/od/parse_nrofbytes.rs b/src/uu/od/src/parse_nrofbytes.rs
similarity index 100%
rename from src/od/parse_nrofbytes.rs
rename to src/uu/od/src/parse_nrofbytes.rs
diff --git a/src/od/partialreader.rs b/src/uu/od/src/partialreader.rs
similarity index 100%
rename from src/od/partialreader.rs
rename to src/uu/od/src/partialreader.rs
diff --git a/src/od/peekreader.rs b/src/uu/od/src/peekreader.rs
similarity index 100%
rename from src/od/peekreader.rs
rename to src/uu/od/src/peekreader.rs
diff --git a/src/od/prn_char.rs b/src/uu/od/src/prn_char.rs
similarity index 100%
rename from src/od/prn_char.rs
rename to src/uu/od/src/prn_char.rs
diff --git a/src/od/prn_float.rs b/src/uu/od/src/prn_float.rs
similarity index 100%
rename from src/od/prn_float.rs
rename to src/uu/od/src/prn_float.rs
diff --git a/src/od/prn_int.rs b/src/uu/od/src/prn_int.rs
similarity index 100%
rename from src/od/prn_int.rs
rename to src/uu/od/src/prn_int.rs
diff --git a/src/paste/Cargo.toml b/src/uu/paste/Cargo.toml
similarity index 100%
rename from src/paste/Cargo.toml
rename to src/uu/paste/Cargo.toml
diff --git a/src/paste/paste.rs b/src/uu/paste/src/paste.rs
similarity index 100%
rename from src/paste/paste.rs
rename to src/uu/paste/src/paste.rs
diff --git a/src/pathchk/Cargo.toml b/src/uu/pathchk/Cargo.toml
similarity index 100%
rename from src/pathchk/Cargo.toml
rename to src/uu/pathchk/Cargo.toml
diff --git a/src/pathchk/pathchk.rs b/src/uu/pathchk/src/pathchk.rs
similarity index 100%
rename from src/pathchk/pathchk.rs
rename to src/uu/pathchk/src/pathchk.rs
diff --git a/src/pinky/Cargo.toml b/src/uu/pinky/Cargo.toml
similarity index 100%
rename from src/pinky/Cargo.toml
rename to src/uu/pinky/Cargo.toml
diff --git a/src/pinky/pinky.rs b/src/uu/pinky/src/pinky.rs
similarity index 100%
rename from src/pinky/pinky.rs
rename to src/uu/pinky/src/pinky.rs
diff --git a/src/printenv/Cargo.toml b/src/uu/printenv/Cargo.toml
similarity index 100%
rename from src/printenv/Cargo.toml
rename to src/uu/printenv/Cargo.toml
diff --git a/src/printenv/printenv.rs b/src/uu/printenv/src/printenv.rs
similarity index 100%
rename from src/printenv/printenv.rs
rename to src/uu/printenv/src/printenv.rs
diff --git a/src/printf/Cargo.toml b/src/uu/printf/Cargo.toml
similarity index 100%
rename from src/printf/Cargo.toml
rename to src/uu/printf/Cargo.toml
diff --git a/src/printf/cli.rs b/src/uu/printf/src/cli.rs
similarity index 100%
rename from src/printf/cli.rs
rename to src/uu/printf/src/cli.rs
diff --git a/src/printf/memo.rs b/src/uu/printf/src/memo.rs
similarity index 100%
rename from src/printf/memo.rs
rename to src/uu/printf/src/memo.rs
diff --git a/src/printf/mod.rs b/src/uu/printf/src/mod.rs
similarity index 100%
rename from src/printf/mod.rs
rename to src/uu/printf/src/mod.rs
diff --git a/src/printf/printf.rs b/src/uu/printf/src/printf.rs
similarity index 100%
rename from src/printf/printf.rs
rename to src/uu/printf/src/printf.rs
diff --git a/src/printf/tokenize/mod.rs b/src/uu/printf/src/tokenize/mod.rs
similarity index 100%
rename from src/printf/tokenize/mod.rs
rename to src/uu/printf/src/tokenize/mod.rs
diff --git a/src/printf/tokenize/num_format/format_field.rs b/src/uu/printf/src/tokenize/num_format/format_field.rs
similarity index 100%
rename from src/printf/tokenize/num_format/format_field.rs
rename to src/uu/printf/src/tokenize/num_format/format_field.rs
diff --git a/src/printf/tokenize/num_format/formatter.rs b/src/uu/printf/src/tokenize/num_format/formatter.rs
similarity index 100%
rename from src/printf/tokenize/num_format/formatter.rs
rename to src/uu/printf/src/tokenize/num_format/formatter.rs
diff --git a/src/printf/tokenize/num_format/formatters/base_conv/mod.rs b/src/uu/printf/src/tokenize/num_format/formatters/base_conv/mod.rs
similarity index 100%
rename from src/printf/tokenize/num_format/formatters/base_conv/mod.rs
rename to src/uu/printf/src/tokenize/num_format/formatters/base_conv/mod.rs
diff --git a/src/printf/tokenize/num_format/formatters/base_conv/tests.rs b/src/uu/printf/src/tokenize/num_format/formatters/base_conv/tests.rs
similarity index 100%
rename from src/printf/tokenize/num_format/formatters/base_conv/tests.rs
rename to src/uu/printf/src/tokenize/num_format/formatters/base_conv/tests.rs
diff --git a/src/printf/tokenize/num_format/formatters/cninetyninehexfloatf.rs b/src/uu/printf/src/tokenize/num_format/formatters/cninetyninehexfloatf.rs
similarity index 100%
rename from src/printf/tokenize/num_format/formatters/cninetyninehexfloatf.rs
rename to src/uu/printf/src/tokenize/num_format/formatters/cninetyninehexfloatf.rs
diff --git a/src/printf/tokenize/num_format/formatters/decf.rs b/src/uu/printf/src/tokenize/num_format/formatters/decf.rs
similarity index 100%
rename from src/printf/tokenize/num_format/formatters/decf.rs
rename to src/uu/printf/src/tokenize/num_format/formatters/decf.rs
diff --git a/src/printf/tokenize/num_format/formatters/float_common.rs b/src/uu/printf/src/tokenize/num_format/formatters/float_common.rs
similarity index 100%
rename from src/printf/tokenize/num_format/formatters/float_common.rs
rename to src/uu/printf/src/tokenize/num_format/formatters/float_common.rs
diff --git a/src/printf/tokenize/num_format/formatters/floatf.rs b/src/uu/printf/src/tokenize/num_format/formatters/floatf.rs
similarity index 100%
rename from src/printf/tokenize/num_format/formatters/floatf.rs
rename to src/uu/printf/src/tokenize/num_format/formatters/floatf.rs
diff --git a/src/printf/tokenize/num_format/formatters/intf.rs b/src/uu/printf/src/tokenize/num_format/formatters/intf.rs
similarity index 100%
rename from src/printf/tokenize/num_format/formatters/intf.rs
rename to src/uu/printf/src/tokenize/num_format/formatters/intf.rs
diff --git a/src/printf/tokenize/num_format/formatters/mod.rs b/src/uu/printf/src/tokenize/num_format/formatters/mod.rs
similarity index 100%
rename from src/printf/tokenize/num_format/formatters/mod.rs
rename to src/uu/printf/src/tokenize/num_format/formatters/mod.rs
diff --git a/src/printf/tokenize/num_format/formatters/scif.rs b/src/uu/printf/src/tokenize/num_format/formatters/scif.rs
similarity index 100%
rename from src/printf/tokenize/num_format/formatters/scif.rs
rename to src/uu/printf/src/tokenize/num_format/formatters/scif.rs
diff --git a/src/printf/tokenize/num_format/mod.rs b/src/uu/printf/src/tokenize/num_format/mod.rs
similarity index 100%
rename from src/printf/tokenize/num_format/mod.rs
rename to src/uu/printf/src/tokenize/num_format/mod.rs
diff --git a/src/printf/tokenize/num_format/num_format.rs b/src/uu/printf/src/tokenize/num_format/num_format.rs
similarity index 100%
rename from src/printf/tokenize/num_format/num_format.rs
rename to src/uu/printf/src/tokenize/num_format/num_format.rs
diff --git a/src/printf/tokenize/sub.rs b/src/uu/printf/src/tokenize/sub.rs
similarity index 100%
rename from src/printf/tokenize/sub.rs
rename to src/uu/printf/src/tokenize/sub.rs
diff --git a/src/printf/tokenize/token.rs b/src/uu/printf/src/tokenize/token.rs
similarity index 100%
rename from src/printf/tokenize/token.rs
rename to src/uu/printf/src/tokenize/token.rs
diff --git a/src/printf/tokenize/unescaped_text.rs b/src/uu/printf/src/tokenize/unescaped_text.rs
similarity index 100%
rename from src/printf/tokenize/unescaped_text.rs
rename to src/uu/printf/src/tokenize/unescaped_text.rs
diff --git a/src/ptx/Cargo.toml b/src/uu/ptx/Cargo.toml
similarity index 100%
rename from src/ptx/Cargo.toml
rename to src/uu/ptx/Cargo.toml
diff --git a/src/ptx/ptx.rs b/src/uu/ptx/src/ptx.rs
similarity index 100%
rename from src/ptx/ptx.rs
rename to src/uu/ptx/src/ptx.rs
diff --git a/src/pwd/Cargo.toml b/src/uu/pwd/Cargo.toml
similarity index 100%
rename from src/pwd/Cargo.toml
rename to src/uu/pwd/Cargo.toml
diff --git a/src/pwd/pwd.rs b/src/uu/pwd/src/pwd.rs
similarity index 100%
rename from src/pwd/pwd.rs
rename to src/uu/pwd/src/pwd.rs
diff --git a/src/readlink/Cargo.toml b/src/uu/readlink/Cargo.toml
similarity index 100%
rename from src/readlink/Cargo.toml
rename to src/uu/readlink/Cargo.toml
diff --git a/src/readlink/readlink.rs b/src/uu/readlink/src/readlink.rs
similarity index 100%
rename from src/readlink/readlink.rs
rename to src/uu/readlink/src/readlink.rs
diff --git a/src/realpath/Cargo.toml b/src/uu/realpath/Cargo.toml
similarity index 100%
rename from src/realpath/Cargo.toml
rename to src/uu/realpath/Cargo.toml
diff --git a/src/realpath/realpath.rs b/src/uu/realpath/src/realpath.rs
similarity index 100%
rename from src/realpath/realpath.rs
rename to src/uu/realpath/src/realpath.rs
diff --git a/src/relpath/Cargo.toml b/src/uu/relpath/Cargo.toml
similarity index 100%
rename from src/relpath/Cargo.toml
rename to src/uu/relpath/Cargo.toml
diff --git a/src/relpath/relpath.rs b/src/uu/relpath/src/relpath.rs
similarity index 100%
rename from src/relpath/relpath.rs
rename to src/uu/relpath/src/relpath.rs
diff --git a/src/rm/Cargo.toml b/src/uu/rm/Cargo.toml
similarity index 100%
rename from src/rm/Cargo.toml
rename to src/uu/rm/Cargo.toml
diff --git a/src/rm/rm.rs b/src/uu/rm/src/rm.rs
similarity index 100%
rename from src/rm/rm.rs
rename to src/uu/rm/src/rm.rs
diff --git a/src/rmdir/Cargo.toml b/src/uu/rmdir/Cargo.toml
similarity index 100%
rename from src/rmdir/Cargo.toml
rename to src/uu/rmdir/Cargo.toml
diff --git a/src/rmdir/rmdir.rs b/src/uu/rmdir/src/rmdir.rs
similarity index 100%
rename from src/rmdir/rmdir.rs
rename to src/uu/rmdir/src/rmdir.rs
diff --git a/src/seq/Cargo.toml b/src/uu/seq/Cargo.toml
similarity index 100%
rename from src/seq/Cargo.toml
rename to src/uu/seq/Cargo.toml
diff --git a/src/seq/seq.rs b/src/uu/seq/src/seq.rs
similarity index 100%
rename from src/seq/seq.rs
rename to src/uu/seq/src/seq.rs
diff --git a/src/shred/Cargo.toml b/src/uu/shred/Cargo.toml
similarity index 100%
rename from src/shred/Cargo.toml
rename to src/uu/shred/Cargo.toml
diff --git a/src/shred/shred.rs b/src/uu/shred/src/shred.rs
similarity index 100%
rename from src/shred/shred.rs
rename to src/uu/shred/src/shred.rs
diff --git a/src/shuf/Cargo.toml b/src/uu/shuf/Cargo.toml
similarity index 100%
rename from src/shuf/Cargo.toml
rename to src/uu/shuf/Cargo.toml
diff --git a/src/shuf/shuf.rs b/src/uu/shuf/src/shuf.rs
similarity index 100%
rename from src/shuf/shuf.rs
rename to src/uu/shuf/src/shuf.rs
diff --git a/src/sleep/Cargo.toml b/src/uu/sleep/Cargo.toml
similarity index 100%
rename from src/sleep/Cargo.toml
rename to src/uu/sleep/Cargo.toml
diff --git a/src/sleep/sleep.rs b/src/uu/sleep/src/sleep.rs
similarity index 100%
rename from src/sleep/sleep.rs
rename to src/uu/sleep/src/sleep.rs
diff --git a/src/sort/Cargo.toml b/src/uu/sort/Cargo.toml
similarity index 100%
rename from src/sort/Cargo.toml
rename to src/uu/sort/Cargo.toml
diff --git a/src/sort/sort.rs b/src/uu/sort/src/sort.rs
similarity index 100%
rename from src/sort/sort.rs
rename to src/uu/sort/src/sort.rs
diff --git a/src/split/Cargo.toml b/src/uu/split/Cargo.toml
similarity index 100%
rename from src/split/Cargo.toml
rename to src/uu/split/Cargo.toml
diff --git a/src/split/README.md b/src/uu/split/README.md
similarity index 100%
rename from src/split/README.md
rename to src/uu/split/README.md
diff --git a/src/split/split.rs b/src/uu/split/src/split.rs
similarity index 100%
rename from src/split/split.rs
rename to src/uu/split/src/split.rs
diff --git a/src/stat/Cargo.toml b/src/uu/stat/Cargo.toml
similarity index 100%
rename from src/stat/Cargo.toml
rename to src/uu/stat/Cargo.toml
diff --git a/src/stat/fsext.rs b/src/uu/stat/src/fsext.rs
similarity index 100%
rename from src/stat/fsext.rs
rename to src/uu/stat/src/fsext.rs
diff --git a/src/stat/stat.rs b/src/uu/stat/src/stat.rs
similarity index 100%
rename from src/stat/stat.rs
rename to src/uu/stat/src/stat.rs
diff --git a/src/stat/test_stat.rs b/src/uu/stat/src/test_stat.rs
similarity index 100%
rename from src/stat/test_stat.rs
rename to src/uu/stat/src/test_stat.rs
diff --git a/src/stdbuf/Cargo.toml b/src/uu/stdbuf/Cargo.toml
similarity index 100%
rename from src/stdbuf/Cargo.toml
rename to src/uu/stdbuf/Cargo.toml
diff --git a/src/stdbuf/build.rs b/src/uu/stdbuf/build.rs
similarity index 100%
rename from src/stdbuf/build.rs
rename to src/uu/stdbuf/build.rs
diff --git a/src/stdbuf/libstdbuf/Cargo.toml b/src/uu/stdbuf/src/libstdbuf/Cargo.toml
similarity index 100%
rename from src/stdbuf/libstdbuf/Cargo.toml
rename to src/uu/stdbuf/src/libstdbuf/Cargo.toml
diff --git a/src/stdbuf/libstdbuf/build.rs b/src/uu/stdbuf/src/libstdbuf/build.rs
similarity index 100%
rename from src/stdbuf/libstdbuf/build.rs
rename to src/uu/stdbuf/src/libstdbuf/build.rs
diff --git a/src/stdbuf/libstdbuf/libstdbuf.rs b/src/uu/stdbuf/src/libstdbuf/src/libstdbuf.rs
similarity index 100%
rename from src/stdbuf/libstdbuf/libstdbuf.rs
rename to src/uu/stdbuf/src/libstdbuf/src/libstdbuf.rs
diff --git a/src/stdbuf/stdbuf.rs b/src/uu/stdbuf/src/stdbuf.rs
similarity index 100%
rename from src/stdbuf/stdbuf.rs
rename to src/uu/stdbuf/src/stdbuf.rs
diff --git a/src/sum/Cargo.toml b/src/uu/sum/Cargo.toml
similarity index 100%
rename from src/sum/Cargo.toml
rename to src/uu/sum/Cargo.toml
diff --git a/src/sum/sum.rs b/src/uu/sum/src/sum.rs
similarity index 100%
rename from src/sum/sum.rs
rename to src/uu/sum/src/sum.rs
diff --git a/src/sync/Cargo.toml b/src/uu/sync/Cargo.toml
similarity index 100%
rename from src/sync/Cargo.toml
rename to src/uu/sync/Cargo.toml
diff --git a/src/sync/sync.rs b/src/uu/sync/src/sync.rs
similarity index 100%
rename from src/sync/sync.rs
rename to src/uu/sync/src/sync.rs
diff --git a/src/tac/Cargo.toml b/src/uu/tac/Cargo.toml
similarity index 100%
rename from src/tac/Cargo.toml
rename to src/uu/tac/Cargo.toml
diff --git a/src/tac/tac.rs b/src/uu/tac/src/tac.rs
similarity index 100%
rename from src/tac/tac.rs
rename to src/uu/tac/src/tac.rs
diff --git a/src/tail/Cargo.toml b/src/uu/tail/Cargo.toml
similarity index 100%
rename from src/tail/Cargo.toml
rename to src/uu/tail/Cargo.toml
diff --git a/src/tail/README.md b/src/uu/tail/README.md
similarity index 100%
rename from src/tail/README.md
rename to src/uu/tail/README.md
diff --git a/src/tail/platform/mod.rs b/src/uu/tail/src/platform/mod.rs
similarity index 100%
rename from src/tail/platform/mod.rs
rename to src/uu/tail/src/platform/mod.rs
diff --git a/src/tail/platform/redox.rs b/src/uu/tail/src/platform/redox.rs
similarity index 100%
rename from src/tail/platform/redox.rs
rename to src/uu/tail/src/platform/redox.rs
diff --git a/src/tail/platform/unix.rs b/src/uu/tail/src/platform/unix.rs
similarity index 100%
rename from src/tail/platform/unix.rs
rename to src/uu/tail/src/platform/unix.rs
diff --git a/src/tail/platform/windows.rs b/src/uu/tail/src/platform/windows.rs
similarity index 100%
rename from src/tail/platform/windows.rs
rename to src/uu/tail/src/platform/windows.rs
diff --git a/src/tail/tail.rs b/src/uu/tail/src/tail.rs
old mode 100755
new mode 100644
similarity index 100%
rename from src/tail/tail.rs
rename to src/uu/tail/src/tail.rs
diff --git a/src/tee/Cargo.toml b/src/uu/tee/Cargo.toml
similarity index 100%
rename from src/tee/Cargo.toml
rename to src/uu/tee/Cargo.toml
diff --git a/src/tee/tee.rs b/src/uu/tee/src/tee.rs
similarity index 100%
rename from src/tee/tee.rs
rename to src/uu/tee/src/tee.rs
diff --git a/src/test/Cargo.toml b/src/uu/test/Cargo.toml
similarity index 100%
rename from src/test/Cargo.toml
rename to src/uu/test/Cargo.toml
diff --git a/src/test/test.rs b/src/uu/test/src/test.rs
similarity index 100%
rename from src/test/test.rs
rename to src/uu/test/src/test.rs
diff --git a/src/timeout/Cargo.toml b/src/uu/timeout/Cargo.toml
similarity index 100%
rename from src/timeout/Cargo.toml
rename to src/uu/timeout/Cargo.toml
diff --git a/src/timeout/timeout.rs b/src/uu/timeout/src/timeout.rs
similarity index 100%
rename from src/timeout/timeout.rs
rename to src/uu/timeout/src/timeout.rs
diff --git a/src/touch/Cargo.toml b/src/uu/touch/Cargo.toml
similarity index 100%
rename from src/touch/Cargo.toml
rename to src/uu/touch/Cargo.toml
diff --git a/src/touch/touch.rs b/src/uu/touch/src/touch.rs
similarity index 100%
rename from src/touch/touch.rs
rename to src/uu/touch/src/touch.rs
diff --git a/src/tr/Cargo.toml b/src/uu/tr/Cargo.toml
similarity index 100%
rename from src/tr/Cargo.toml
rename to src/uu/tr/Cargo.toml
diff --git a/src/tr/expand.rs b/src/uu/tr/src/expand.rs
similarity index 100%
rename from src/tr/expand.rs
rename to src/uu/tr/src/expand.rs
diff --git a/src/tr/tr.rs b/src/uu/tr/src/tr.rs
similarity index 100%
rename from src/tr/tr.rs
rename to src/uu/tr/src/tr.rs
diff --git a/src/true/Cargo.toml b/src/uu/true/Cargo.toml
similarity index 100%
rename from src/true/Cargo.toml
rename to src/uu/true/Cargo.toml
diff --git a/src/true/true.rs b/src/uu/true/src/true.rs
similarity index 100%
rename from src/true/true.rs
rename to src/uu/true/src/true.rs
diff --git a/src/truncate/Cargo.toml b/src/uu/truncate/Cargo.toml
similarity index 100%
rename from src/truncate/Cargo.toml
rename to src/uu/truncate/Cargo.toml
diff --git a/src/truncate/truncate.rs b/src/uu/truncate/src/truncate.rs
similarity index 100%
rename from src/truncate/truncate.rs
rename to src/uu/truncate/src/truncate.rs
diff --git a/src/tsort/Cargo.toml b/src/uu/tsort/Cargo.toml
similarity index 100%
rename from src/tsort/Cargo.toml
rename to src/uu/tsort/Cargo.toml
diff --git a/src/tsort/tsort.rs b/src/uu/tsort/src/tsort.rs
similarity index 100%
rename from src/tsort/tsort.rs
rename to src/uu/tsort/src/tsort.rs
diff --git a/src/tty/Cargo.toml b/src/uu/tty/Cargo.toml
similarity index 100%
rename from src/tty/Cargo.toml
rename to src/uu/tty/Cargo.toml
diff --git a/src/tty/tty.rs b/src/uu/tty/src/tty.rs
similarity index 100%
rename from src/tty/tty.rs
rename to src/uu/tty/src/tty.rs
diff --git a/src/uname/Cargo.toml b/src/uu/uname/Cargo.toml
similarity index 100%
rename from src/uname/Cargo.toml
rename to src/uu/uname/Cargo.toml
diff --git a/src/uname/uname.rs b/src/uu/uname/src/uname.rs
similarity index 100%
rename from src/uname/uname.rs
rename to src/uu/uname/src/uname.rs
diff --git a/src/unexpand/Cargo.toml b/src/uu/unexpand/Cargo.toml
similarity index 100%
rename from src/unexpand/Cargo.toml
rename to src/uu/unexpand/Cargo.toml
diff --git a/src/unexpand/unexpand.rs b/src/uu/unexpand/src/unexpand.rs
similarity index 100%
rename from src/unexpand/unexpand.rs
rename to src/uu/unexpand/src/unexpand.rs
diff --git a/src/uniq/Cargo.toml b/src/uu/uniq/Cargo.toml
similarity index 100%
rename from src/uniq/Cargo.toml
rename to src/uu/uniq/Cargo.toml
diff --git a/src/uniq/uniq.rs b/src/uu/uniq/src/uniq.rs
similarity index 100%
rename from src/uniq/uniq.rs
rename to src/uu/uniq/src/uniq.rs
diff --git a/src/unlink/Cargo.toml b/src/uu/unlink/Cargo.toml
similarity index 100%
rename from src/unlink/Cargo.toml
rename to src/uu/unlink/Cargo.toml
diff --git a/src/unlink/unlink.rs b/src/uu/unlink/src/unlink.rs
similarity index 100%
rename from src/unlink/unlink.rs
rename to src/uu/unlink/src/unlink.rs
diff --git a/src/uptime/Cargo.toml b/src/uu/uptime/Cargo.toml
similarity index 100%
rename from src/uptime/Cargo.toml
rename to src/uu/uptime/Cargo.toml
diff --git a/src/uptime/uptime.rs b/src/uu/uptime/src/uptime.rs
similarity index 100%
rename from src/uptime/uptime.rs
rename to src/uu/uptime/src/uptime.rs
diff --git a/src/users/Cargo.toml b/src/uu/users/Cargo.toml
similarity index 100%
rename from src/users/Cargo.toml
rename to src/uu/users/Cargo.toml
diff --git a/src/users/users.rs b/src/uu/users/src/users.rs
similarity index 100%
rename from src/users/users.rs
rename to src/uu/users/src/users.rs
diff --git a/src/wc/Cargo.toml b/src/uu/wc/Cargo.toml
similarity index 100%
rename from src/wc/Cargo.toml
rename to src/uu/wc/Cargo.toml
diff --git a/src/wc/wc.rs b/src/uu/wc/src/wc.rs
similarity index 100%
rename from src/wc/wc.rs
rename to src/uu/wc/src/wc.rs
diff --git a/src/who/Cargo.toml b/src/uu/who/Cargo.toml
similarity index 100%
rename from src/who/Cargo.toml
rename to src/uu/who/Cargo.toml
diff --git a/src/who/who.rs b/src/uu/who/src/who.rs
similarity index 100%
rename from src/who/who.rs
rename to src/uu/who/src/who.rs
diff --git a/src/whoami/Cargo.toml b/src/uu/whoami/Cargo.toml
similarity index 100%
rename from src/whoami/Cargo.toml
rename to src/uu/whoami/Cargo.toml
diff --git a/src/whoami/platform/mod.rs b/src/uu/whoami/src/platform/mod.rs
similarity index 100%
rename from src/whoami/platform/mod.rs
rename to src/uu/whoami/src/platform/mod.rs
diff --git a/src/whoami/platform/unix.rs b/src/uu/whoami/src/platform/unix.rs
similarity index 100%
rename from src/whoami/platform/unix.rs
rename to src/uu/whoami/src/platform/unix.rs
diff --git a/src/whoami/platform/windows.rs b/src/uu/whoami/src/platform/windows.rs
similarity index 100%
rename from src/whoami/platform/windows.rs
rename to src/uu/whoami/src/platform/windows.rs
diff --git a/src/whoami/whoami.rs b/src/uu/whoami/src/whoami.rs
similarity index 100%
rename from src/whoami/whoami.rs
rename to src/uu/whoami/src/whoami.rs
diff --git a/src/yes/Cargo.toml b/src/uu/yes/Cargo.toml
similarity index 100%
rename from src/yes/Cargo.toml
rename to src/uu/yes/Cargo.toml
diff --git a/src/yes/yes.rs b/src/uu/yes/src/yes.rs
similarity index 100%
rename from src/yes/yes.rs
rename to src/uu/yes/src/yes.rs