diff --git a/build/README.md b/build/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/manager/cli/README.md b/manager/cli/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/upatch/upatch-build/upatch-build/Cargo.toml b/upatch/upatch-build/Cargo.toml
similarity index 100%
rename from upatch/upatch-build/upatch-build/Cargo.toml
rename to upatch/upatch-build/Cargo.toml
diff --git a/upatch/upatch-build/upatch-build/src/arg.rs b/upatch/upatch-build/src/arg.rs
similarity index 100%
rename from upatch/upatch-build/upatch-build/src/arg.rs
rename to upatch/upatch-build/src/arg.rs
diff --git a/upatch/upatch-build/upatch-build/src/dwarf/dwarf.rs b/upatch/upatch-build/src/dwarf/dwarf.rs
similarity index 100%
rename from upatch/upatch-build/upatch-build/src/dwarf/dwarf.rs
rename to upatch/upatch-build/src/dwarf/dwarf.rs
diff --git a/upatch/upatch-build/upatch-build/src/dwarf/error.rs b/upatch/upatch-build/src/dwarf/error.rs
similarity index 100%
rename from upatch/upatch-build/upatch-build/src/dwarf/error.rs
rename to upatch/upatch-build/src/dwarf/error.rs
diff --git a/upatch/upatch-build/upatch-build/src/dwarf/mod.rs b/upatch/upatch-build/src/dwarf/mod.rs
similarity index 100%
rename from upatch/upatch-build/upatch-build/src/dwarf/mod.rs
rename to upatch/upatch-build/src/dwarf/mod.rs
diff --git a/upatch/upatch-build/upatch-build/src/dwarf/relocate.rs b/upatch/upatch-build/src/dwarf/relocate.rs
similarity index 100%
rename from upatch/upatch-build/upatch-build/src/dwarf/relocate.rs
rename to upatch/upatch-build/src/dwarf/relocate.rs
diff --git a/upatch/upatch-build/upatch-build/src/lib.rs b/upatch/upatch-build/src/lib.rs
similarity index 100%
rename from upatch/upatch-build/upatch-build/src/lib.rs
rename to upatch/upatch-build/src/lib.rs
diff --git a/upatch/upatch-build/upatch-build/src/main.rs b/upatch/upatch-build/src/main.rs
similarity index 100%
rename from upatch/upatch-build/upatch-build/src/main.rs
rename to upatch/upatch-build/src/main.rs
diff --git a/upatch/upatch-build/upatch-build/src/upatch/build.rs b/upatch/upatch-build/src/upatch/build.rs
similarity index 100%
rename from upatch/upatch-build/upatch-build/src/upatch/build.rs
rename to upatch/upatch-build/src/upatch/build.rs
diff --git a/upatch/upatch-build/upatch-build/src/upatch/compiler.rs b/upatch/upatch-build/src/upatch/compiler.rs
similarity index 100%
rename from upatch/upatch-build/upatch-build/src/upatch/compiler.rs
rename to upatch/upatch-build/src/upatch/compiler.rs
diff --git a/upatch/upatch-build/upatch-build/src/upatch/mod.rs b/upatch/upatch-build/src/upatch/mod.rs
similarity index 100%
rename from upatch/upatch-build/upatch-build/src/upatch/mod.rs
rename to upatch/upatch-build/src/upatch/mod.rs
diff --git a/upatch/upatch-build/upatch-build/src/upatch/project.rs b/upatch/upatch-build/src/upatch/project.rs
similarity index 100%
rename from upatch/upatch-build/upatch-build/src/upatch/project.rs
rename to upatch/upatch-build/src/upatch/project.rs
diff --git a/upatch/upatch-build/CMakeLists.txt b/upatch/upatch-diff/CMakeLists.txt
similarity index 100%
rename from upatch/upatch-build/CMakeLists.txt
rename to upatch/upatch-diff/CMakeLists.txt
diff --git a/upatch/upatch-build/create-diff-object.c b/upatch/upatch-diff/create-diff-object.c
similarity index 100%
rename from upatch/upatch-build/create-diff-object.c
rename to upatch/upatch-diff/create-diff-object.c
diff --git a/upatch/upatch-build/elf-common.c b/upatch/upatch-diff/elf-common.c
similarity index 100%
rename from upatch/upatch-build/elf-common.c
rename to upatch/upatch-diff/elf-common.c
diff --git a/upatch/upatch-build/elf-common.h b/upatch/upatch-diff/elf-common.h
similarity index 100%
rename from upatch/upatch-build/elf-common.h
rename to upatch/upatch-diff/elf-common.h
diff --git a/upatch/upatch-build/elf-compare.c b/upatch/upatch-diff/elf-compare.c
similarity index 100%
rename from upatch/upatch-build/elf-compare.c
rename to upatch/upatch-diff/elf-compare.c
diff --git a/upatch/upatch-build/elf-compare.h b/upatch/upatch-diff/elf-compare.h
similarity index 100%
rename from upatch/upatch-build/elf-compare.h
rename to upatch/upatch-diff/elf-compare.h
diff --git a/upatch/upatch-build/elf-correlate.c b/upatch/upatch-diff/elf-correlate.c
similarity index 100%
rename from upatch/upatch-build/elf-correlate.c
rename to upatch/upatch-diff/elf-correlate.c
diff --git a/upatch/upatch-build/elf-correlate.h b/upatch/upatch-diff/elf-correlate.h
similarity index 100%
rename from upatch/upatch-build/elf-correlate.h
rename to upatch/upatch-diff/elf-correlate.h
diff --git a/upatch/upatch-build/elf-create.c b/upatch/upatch-diff/elf-create.c
similarity index 100%
rename from upatch/upatch-build/elf-create.c
rename to upatch/upatch-diff/elf-create.c
diff --git a/upatch/upatch-build/elf-create.h b/upatch/upatch-diff/elf-create.h
similarity index 100%
rename from upatch/upatch-build/elf-create.h
rename to upatch/upatch-diff/elf-create.h
diff --git a/upatch/upatch-build/elf-debug.c b/upatch/upatch-diff/elf-debug.c
similarity index 100%
rename from upatch/upatch-build/elf-debug.c
rename to upatch/upatch-diff/elf-debug.c
diff --git a/upatch/upatch-build/elf-debug.h b/upatch/upatch-diff/elf-debug.h
similarity index 100%
rename from upatch/upatch-build/elf-debug.h
rename to upatch/upatch-diff/elf-debug.h
diff --git a/upatch/upatch-build/elf-insn.c b/upatch/upatch-diff/elf-insn.c
similarity index 100%
rename from upatch/upatch-build/elf-insn.c
rename to upatch/upatch-diff/elf-insn.c
diff --git a/upatch/upatch-build/elf-insn.h b/upatch/upatch-diff/elf-insn.h
similarity index 100%
rename from upatch/upatch-build/elf-insn.h
rename to upatch/upatch-diff/elf-insn.h
diff --git a/upatch/upatch-build/insn/asm/inat-tables.h b/upatch/upatch-diff/insn/asm/inat-tables.h
similarity index 100%
rename from upatch/upatch-build/insn/asm/inat-tables.h
rename to upatch/upatch-diff/insn/asm/inat-tables.h
diff --git a/upatch/upatch-build/insn/asm/inat-types.h b/upatch/upatch-diff/insn/asm/inat-types.h
similarity index 100%
rename from upatch/upatch-build/insn/asm/inat-types.h
rename to upatch/upatch-diff/insn/asm/inat-types.h
diff --git a/upatch/upatch-build/insn/asm/inat.h b/upatch/upatch-diff/insn/asm/inat.h
similarity index 100%
rename from upatch/upatch-build/insn/asm/inat.h
rename to upatch/upatch-diff/insn/asm/inat.h
diff --git a/upatch/upatch-build/insn/asm/insn.h b/upatch/upatch-diff/insn/asm/insn.h
similarity index 100%
rename from upatch/upatch-build/insn/asm/insn.h
rename to upatch/upatch-diff/insn/asm/insn.h
diff --git a/upatch/upatch-build/insn/inat.c b/upatch/upatch-diff/insn/inat.c
similarity index 100%
rename from upatch/upatch-build/insn/inat.c
rename to upatch/upatch-diff/insn/inat.c
diff --git a/upatch/upatch-build/insn/insn.c b/upatch/upatch-diff/insn/insn.c
similarity index 100%
rename from upatch/upatch-build/insn/insn.c
rename to upatch/upatch-diff/insn/insn.c
diff --git a/upatch/upatch-build/list.h b/upatch/upatch-diff/list.h
similarity index 100%
rename from upatch/upatch-build/list.h
rename to upatch/upatch-diff/list.h
diff --git a/upatch/upatch-build/log.h b/upatch/upatch-diff/log.h
similarity index 100%
rename from upatch/upatch-build/log.h
rename to upatch/upatch-diff/log.h
diff --git a/upatch/upatch-build/running-elf.c b/upatch/upatch-diff/running-elf.c
similarity index 100%
rename from upatch/upatch-build/running-elf.c
rename to upatch/upatch-diff/running-elf.c
diff --git a/upatch/upatch-build/running-elf.h b/upatch/upatch-diff/running-elf.h
similarity index 100%
rename from upatch/upatch-build/running-elf.h
rename to upatch/upatch-diff/running-elf.h
diff --git a/upatch/upatch-build/upatch-dynrela.h b/upatch/upatch-diff/upatch-dynrela.h
similarity index 100%
rename from upatch/upatch-build/upatch-dynrela.h
rename to upatch/upatch-diff/upatch-dynrela.h
diff --git a/upatch/upatch-build/upatch-elf.c b/upatch/upatch-diff/upatch-elf.c
similarity index 100%
rename from upatch/upatch-build/upatch-elf.c
rename to upatch/upatch-diff/upatch-elf.c
diff --git a/upatch/upatch-build/upatch-elf.h b/upatch/upatch-diff/upatch-elf.h
similarity index 100%
rename from upatch/upatch-build/upatch-elf.h
rename to upatch/upatch-diff/upatch-elf.h
diff --git a/upatch/upatch-build/upatch-patch.h b/upatch/upatch-diff/upatch-patch.h
similarity index 100%
rename from upatch/upatch-build/upatch-patch.h
rename to upatch/upatch-diff/upatch-patch.h