diff --git a/system/cbootimage/GNUmakefile b/GNUmakefile
similarity index 100%
rename from system/cbootimage/GNUmakefile
rename to GNUmakefile
diff --git a/system/cbootimage/aes_ref.c b/aes_ref.c
similarity index 100%
rename from system/cbootimage/aes_ref.c
rename to aes_ref.c
diff --git a/system/cbootimage/cbootimage.c b/cbootimage.c
similarity index 100%
rename from system/cbootimage/cbootimage.c
rename to cbootimage.c
diff --git a/system/cbootimage/cbootimage.h b/cbootimage.h
similarity index 100%
rename from system/cbootimage/cbootimage.h
rename to cbootimage.h
diff --git a/system/cbootimage/crypto.c b/crypto.c
similarity index 100%
rename from system/cbootimage/crypto.c
rename to crypto.c
diff --git a/system/cbootimage/crypto.h b/crypto.h
similarity index 100%
rename from system/cbootimage/crypto.h
rename to crypto.h
diff --git a/system/cbootimage/data_layout.c b/data_layout.c
similarity index 100%
rename from system/cbootimage/data_layout.c
rename to data_layout.c
diff --git a/system/cbootimage/data_layout.h b/data_layout.h
similarity index 100%
rename from system/cbootimage/data_layout.h
rename to data_layout.h
diff --git a/system/cbootimage/nvaes_ref.h b/nvaes_ref.h
similarity index 100%
rename from system/cbootimage/nvaes_ref.h
rename to nvaes_ref.h
diff --git a/system/cbootimage/nvbctlib.h b/nvbctlib.h
similarity index 100%
rename from system/cbootimage/nvbctlib.h
rename to nvbctlib.h
diff --git a/system/cbootimage/nvbctlib_ap20.c b/nvbctlib_ap20.c
similarity index 100%
rename from system/cbootimage/nvbctlib_ap20.c
rename to nvbctlib_ap20.c
diff --git a/system/cbootimage/nvboot_bct.h b/nvboot_bct.h
similarity index 100%
rename from system/cbootimage/nvboot_bct.h
rename to nvboot_bct.h
diff --git a/system/cbootimage/parse.c b/parse.c
similarity index 100%
rename from system/cbootimage/parse.c
rename to parse.c
diff --git a/system/cbootimage/parse.h b/parse.h
similarity index 100%
rename from system/cbootimage/parse.h
rename to parse.h
diff --git a/system/cbootimage/set.c b/set.c
similarity index 100%
rename from system/cbootimage/set.c
rename to set.c
diff --git a/system/cbootimage/set.h b/set.h
similarity index 100%
rename from system/cbootimage/set.h
rename to set.h