diff --git a/.gitignore b/libfdt/.gitignore
similarity index 100%
rename from .gitignore
rename to libfdt/.gitignore
diff --git a/GPL b/libfdt/GPL
similarity index 100%
rename from GPL
rename to libfdt/GPL
diff --git a/Makefile b/libfdt/Makefile
similarity index 100%
rename from Makefile
rename to libfdt/Makefile
diff --git a/TODO b/libfdt/TODO
similarity index 100%
rename from TODO
rename to libfdt/TODO
diff --git a/fdt.c b/libfdt/fdt.c
similarity index 100%
rename from fdt.c
rename to libfdt/fdt.c
diff --git a/fdt.h b/libfdt/fdt.h
similarity index 100%
rename from fdt.h
rename to libfdt/fdt.h
diff --git a/fdt_ro.c b/libfdt/fdt_ro.c
similarity index 100%
rename from fdt_ro.c
rename to libfdt/fdt_ro.c
diff --git a/fdt_rw.c b/libfdt/fdt_rw.c
similarity index 100%
rename from fdt_rw.c
rename to libfdt/fdt_rw.c
diff --git a/fdt_strerror.c b/libfdt/fdt_strerror.c
similarity index 100%
rename from fdt_strerror.c
rename to libfdt/fdt_strerror.c
diff --git a/fdt_sw.c b/libfdt/fdt_sw.c
similarity index 100%
rename from fdt_sw.c
rename to libfdt/fdt_sw.c
diff --git a/fdt_wip.c b/libfdt/fdt_wip.c
similarity index 100%
rename from fdt_wip.c
rename to libfdt/fdt_wip.c
diff --git a/libfdt.h b/libfdt/libfdt.h
similarity index 100%
rename from libfdt.h
rename to libfdt/libfdt.h
diff --git a/libfdt_env.h b/libfdt/libfdt_env.h
similarity index 100%
rename from libfdt_env.h
rename to libfdt/libfdt_env.h
diff --git a/libfdt_internal.h b/libfdt/libfdt_internal.h
similarity index 100%
rename from libfdt_internal.h
rename to libfdt/libfdt_internal.h
diff --git a/tests/.gitignore b/libfdt/tests/.gitignore
similarity index 100%
rename from tests/.gitignore
rename to libfdt/tests/.gitignore
diff --git a/tests/Makefile b/libfdt/tests/Makefile
similarity index 100%
rename from tests/Makefile
rename to libfdt/tests/Makefile
diff --git a/tests/del_node.c b/libfdt/tests/del_node.c
similarity index 100%
rename from tests/del_node.c
rename to libfdt/tests/del_node.c
diff --git a/tests/del_property.c b/libfdt/tests/del_property.c
similarity index 100%
rename from tests/del_property.c
rename to libfdt/tests/del_property.c
diff --git a/tests/dumptrees.c b/libfdt/tests/dumptrees.c
similarity index 100%
rename from tests/dumptrees.c
rename to libfdt/tests/dumptrees.c
diff --git a/tests/find_property.c b/libfdt/tests/find_property.c
similarity index 100%
rename from tests/find_property.c
rename to libfdt/tests/find_property.c
diff --git a/tests/getprop.c b/libfdt/tests/getprop.c
similarity index 100%
rename from tests/getprop.c
rename to libfdt/tests/getprop.c
diff --git a/tests/move_and_save.c b/libfdt/tests/move_and_save.c
similarity index 100%
rename from tests/move_and_save.c
rename to libfdt/tests/move_and_save.c
diff --git a/tests/nop_node.c b/libfdt/tests/nop_node.c
similarity index 100%
rename from tests/nop_node.c
rename to libfdt/tests/nop_node.c
diff --git a/tests/nop_property.c b/libfdt/tests/nop_property.c
similarity index 100%
rename from tests/nop_property.c
rename to libfdt/tests/nop_property.c
diff --git a/tests/notfound.c b/libfdt/tests/notfound.c
similarity index 100%
rename from tests/notfound.c
rename to libfdt/tests/notfound.c
diff --git a/tests/open_pack.c b/libfdt/tests/open_pack.c
similarity index 100%
rename from tests/open_pack.c
rename to libfdt/tests/open_pack.c
diff --git a/tests/path_offset.c b/libfdt/tests/path_offset.c
similarity index 100%
rename from tests/path_offset.c
rename to libfdt/tests/path_offset.c
diff --git a/tests/root_node.c b/libfdt/tests/root_node.c
similarity index 100%
rename from tests/root_node.c
rename to libfdt/tests/root_node.c
diff --git a/tests/run_tests.sh b/libfdt/tests/run_tests.sh
similarity index 100%
rename from tests/run_tests.sh
rename to libfdt/tests/run_tests.sh
diff --git a/tests/rw_tree1.c b/libfdt/tests/rw_tree1.c
similarity index 100%
rename from tests/rw_tree1.c
rename to libfdt/tests/rw_tree1.c
diff --git a/tests/setprop.c b/libfdt/tests/setprop.c
similarity index 100%
rename from tests/setprop.c
rename to libfdt/tests/setprop.c
diff --git a/tests/setprop_inplace.c b/libfdt/tests/setprop_inplace.c
similarity index 100%
rename from tests/setprop_inplace.c
rename to libfdt/tests/setprop_inplace.c
diff --git a/tests/subnode_offset.c b/libfdt/tests/subnode_offset.c
similarity index 100%
rename from tests/subnode_offset.c
rename to libfdt/tests/subnode_offset.c
diff --git a/tests/sw_tree1.c b/libfdt/tests/sw_tree1.c
similarity index 100%
rename from tests/sw_tree1.c
rename to libfdt/tests/sw_tree1.c
diff --git a/tests/testdata.h b/libfdt/tests/testdata.h
similarity index 100%
rename from tests/testdata.h
rename to libfdt/tests/testdata.h
diff --git a/tests/tests.h b/libfdt/tests/tests.h
similarity index 100%
rename from tests/tests.h
rename to libfdt/tests/tests.h
diff --git a/tests/testutils.c b/libfdt/tests/testutils.c
similarity index 100%
rename from tests/testutils.c
rename to libfdt/tests/testutils.c
diff --git a/tests/trees.S b/libfdt/tests/trees.S
similarity index 100%
rename from tests/trees.S
rename to libfdt/tests/trees.S
diff --git a/tests/truncated_property.c b/libfdt/tests/truncated_property.c
similarity index 100%
rename from tests/truncated_property.c
rename to libfdt/tests/truncated_property.c