diff --git a/CMakeLists.txt b/libhsakmt/CMakeLists.txt
similarity index 100%
rename from CMakeLists.txt
rename to libhsakmt/CMakeLists.txt
diff --git a/DEBIAN/control b/libhsakmt/DEBIAN/control
similarity index 100%
rename from DEBIAN/control
rename to libhsakmt/DEBIAN/control
diff --git a/DEBIAN/postinst.in b/libhsakmt/DEBIAN/postinst.in
similarity index 100%
rename from DEBIAN/postinst.in
rename to libhsakmt/DEBIAN/postinst.in
diff --git a/DEBIAN/prerm.in b/libhsakmt/DEBIAN/prerm.in
similarity index 100%
rename from DEBIAN/prerm.in
rename to libhsakmt/DEBIAN/prerm.in
diff --git a/DEBIAN/x86_64-libhsakmt.conf b/libhsakmt/DEBIAN/x86_64-libhsakmt.conf
similarity index 100%
rename from DEBIAN/x86_64-libhsakmt.conf
rename to libhsakmt/DEBIAN/x86_64-libhsakmt.conf
diff --git a/LICENSE.md b/libhsakmt/LICENSE.md
similarity index 100%
rename from LICENSE.md
rename to libhsakmt/LICENSE.md
diff --git a/README.md b/libhsakmt/README.md
similarity index 100%
rename from README.md
rename to libhsakmt/README.md
diff --git a/RPM/hsakmt-roct-devel.spec.in b/libhsakmt/RPM/hsakmt-roct-devel.spec.in
similarity index 100%
rename from RPM/hsakmt-roct-devel.spec.in
rename to libhsakmt/RPM/hsakmt-roct-devel.spec.in
diff --git a/RPM/libhsakmt.spec b/libhsakmt/RPM/libhsakmt.spec
similarity index 100%
rename from RPM/libhsakmt.spec
rename to libhsakmt/RPM/libhsakmt.spec
diff --git a/RPM/post.in b/libhsakmt/RPM/post.in
similarity index 100%
rename from RPM/post.in
rename to libhsakmt/RPM/post.in
diff --git a/RPM/postun.in b/libhsakmt/RPM/postun.in
similarity index 100%
rename from RPM/postun.in
rename to libhsakmt/RPM/postun.in
diff --git a/cmake_modules/utils.cmake b/libhsakmt/cmake_modules/utils.cmake
similarity index 100%
rename from cmake_modules/utils.cmake
rename to libhsakmt/cmake_modules/utils.cmake
diff --git a/hsakmt-backward-compat.cmake b/libhsakmt/hsakmt-backward-compat.cmake
similarity index 100%
rename from hsakmt-backward-compat.cmake
rename to libhsakmt/hsakmt-backward-compat.cmake
diff --git a/hsakmt-config.cmake.in b/libhsakmt/hsakmt-config.cmake.in
similarity index 100%
rename from hsakmt-config.cmake.in
rename to libhsakmt/hsakmt-config.cmake.in
diff --git a/include/hsakmt/hsakmt.h b/libhsakmt/include/hsakmt/hsakmt.h
similarity index 100%
rename from include/hsakmt/hsakmt.h
rename to libhsakmt/include/hsakmt/hsakmt.h
diff --git a/include/hsakmt/hsakmttypes.h b/libhsakmt/include/hsakmt/hsakmttypes.h
similarity index 100%
rename from include/hsakmt/hsakmttypes.h
rename to libhsakmt/include/hsakmt/hsakmttypes.h
diff --git a/include/hsakmt/linux/kfd_ioctl.h b/libhsakmt/include/hsakmt/linux/kfd_ioctl.h
similarity index 100%
rename from include/hsakmt/linux/kfd_ioctl.h
rename to libhsakmt/include/hsakmt/linux/kfd_ioctl.h
diff --git a/libhsakmt.pc.in b/libhsakmt/libhsakmt.pc.in
similarity index 100%
rename from libhsakmt.pc.in
rename to libhsakmt/libhsakmt.pc.in
diff --git a/src/debug.c b/libhsakmt/src/debug.c
similarity index 100%
rename from src/debug.c
rename to libhsakmt/src/debug.c
diff --git a/src/events.c b/libhsakmt/src/events.c
similarity index 100%
rename from src/events.c
rename to libhsakmt/src/events.c
diff --git a/src/fmm.c b/libhsakmt/src/fmm.c
similarity index 100%
rename from src/fmm.c
rename to libhsakmt/src/fmm.c
diff --git a/src/fmm.h b/libhsakmt/src/fmm.h
similarity index 100%
rename from src/fmm.h
rename to libhsakmt/src/fmm.h
diff --git a/src/globals.c b/libhsakmt/src/globals.c
similarity index 100%
rename from src/globals.c
rename to libhsakmt/src/globals.c
diff --git a/src/libhsakmt.c b/libhsakmt/src/libhsakmt.c
similarity index 100%
rename from src/libhsakmt.c
rename to libhsakmt/src/libhsakmt.c
diff --git a/src/libhsakmt.h b/libhsakmt/src/libhsakmt.h
similarity index 100%
rename from src/libhsakmt.h
rename to libhsakmt/src/libhsakmt.h
diff --git a/src/libhsakmt.ver b/libhsakmt/src/libhsakmt.ver
similarity index 100%
rename from src/libhsakmt.ver
rename to libhsakmt/src/libhsakmt.ver
diff --git a/src/memory.c b/libhsakmt/src/memory.c
similarity index 100%
rename from src/memory.c
rename to libhsakmt/src/memory.c
diff --git a/src/openclose.c b/libhsakmt/src/openclose.c
similarity index 100%
rename from src/openclose.c
rename to libhsakmt/src/openclose.c
diff --git a/src/pc_sampling.c b/libhsakmt/src/pc_sampling.c
similarity index 100%
rename from src/pc_sampling.c
rename to libhsakmt/src/pc_sampling.c
diff --git a/src/perfctr.c b/libhsakmt/src/perfctr.c
similarity index 100%
rename from src/perfctr.c
rename to libhsakmt/src/perfctr.c
diff --git a/src/pmc_table.c b/libhsakmt/src/pmc_table.c
similarity index 100%
rename from src/pmc_table.c
rename to libhsakmt/src/pmc_table.c
diff --git a/src/pmc_table.h b/libhsakmt/src/pmc_table.h
similarity index 100%
rename from src/pmc_table.h
rename to libhsakmt/src/pmc_table.h
diff --git a/src/queues.c b/libhsakmt/src/queues.c
similarity index 100%
rename from src/queues.c
rename to libhsakmt/src/queues.c
diff --git a/src/rbtree.c b/libhsakmt/src/rbtree.c
similarity index 100%
rename from src/rbtree.c
rename to libhsakmt/src/rbtree.c
diff --git a/src/rbtree.h b/libhsakmt/src/rbtree.h
similarity index 100%
rename from src/rbtree.h
rename to libhsakmt/src/rbtree.h
diff --git a/src/rbtree_amd.h b/libhsakmt/src/rbtree_amd.h
similarity index 100%
rename from src/rbtree_amd.h
rename to libhsakmt/src/rbtree_amd.h
diff --git a/src/spm.c b/libhsakmt/src/spm.c
similarity index 100%
rename from src/spm.c
rename to libhsakmt/src/spm.c
diff --git a/src/svm.c b/libhsakmt/src/svm.c
similarity index 100%
rename from src/svm.c
rename to libhsakmt/src/svm.c
diff --git a/src/time.c b/libhsakmt/src/time.c
similarity index 100%
rename from src/time.c
rename to libhsakmt/src/time.c
diff --git a/src/topology.c b/libhsakmt/src/topology.c
similarity index 100%
rename from src/topology.c
rename to libhsakmt/src/topology.c
diff --git a/src/version.c b/libhsakmt/src/version.c
similarity index 100%
rename from src/version.c
rename to libhsakmt/src/version.c
diff --git a/tests/kfdtest/.gitignore b/libhsakmt/tests/kfdtest/.gitignore
similarity index 100%
rename from tests/kfdtest/.gitignore
rename to libhsakmt/tests/kfdtest/.gitignore
diff --git a/tests/kfdtest/CMakeLists.txt b/libhsakmt/tests/kfdtest/CMakeLists.txt
similarity index 100%
rename from tests/kfdtest/CMakeLists.txt
rename to libhsakmt/tests/kfdtest/CMakeLists.txt
diff --git a/tests/kfdtest/LICENSE.kfdtest b/libhsakmt/tests/kfdtest/LICENSE.kfdtest
similarity index 100%
rename from tests/kfdtest/LICENSE.kfdtest
rename to libhsakmt/tests/kfdtest/LICENSE.kfdtest
diff --git a/tests/kfdtest/README.txt b/libhsakmt/tests/kfdtest/README.txt
similarity index 100%
rename from tests/kfdtest/README.txt
rename to libhsakmt/tests/kfdtest/README.txt
diff --git a/tests/kfdtest/gtest-1.6.0/gtest-all.cpp b/libhsakmt/tests/kfdtest/gtest-1.6.0/gtest-all.cpp
similarity index 100%
rename from tests/kfdtest/gtest-1.6.0/gtest-all.cpp
rename to libhsakmt/tests/kfdtest/gtest-1.6.0/gtest-all.cpp
diff --git a/tests/kfdtest/gtest-1.6.0/gtest/gtest.h b/libhsakmt/tests/kfdtest/gtest-1.6.0/gtest/gtest.h
similarity index 100%
rename from tests/kfdtest/gtest-1.6.0/gtest/gtest.h
rename to libhsakmt/tests/kfdtest/gtest-1.6.0/gtest/gtest.h
diff --git a/tests/kfdtest/include/amdp2ptest.h b/libhsakmt/tests/kfdtest/include/amdp2ptest.h
similarity index 100%
rename from tests/kfdtest/include/amdp2ptest.h
rename to libhsakmt/tests/kfdtest/include/amdp2ptest.h
diff --git a/tests/kfdtest/include/asic_reg/gfx_7_2_d.h b/libhsakmt/tests/kfdtest/include/asic_reg/gfx_7_2_d.h
similarity index 100%
rename from tests/kfdtest/include/asic_reg/gfx_7_2_d.h
rename to libhsakmt/tests/kfdtest/include/asic_reg/gfx_7_2_d.h
diff --git a/tests/kfdtest/include/asic_reg/gfx_7_2_enum.h b/libhsakmt/tests/kfdtest/include/asic_reg/gfx_7_2_enum.h
similarity index 100%
rename from tests/kfdtest/include/asic_reg/gfx_7_2_enum.h
rename to libhsakmt/tests/kfdtest/include/asic_reg/gfx_7_2_enum.h
diff --git a/tests/kfdtest/include/asic_reg/gfx_7_2_sh_mask.h b/libhsakmt/tests/kfdtest/include/asic_reg/gfx_7_2_sh_mask.h
similarity index 100%
rename from tests/kfdtest/include/asic_reg/gfx_7_2_sh_mask.h
rename to libhsakmt/tests/kfdtest/include/asic_reg/gfx_7_2_sh_mask.h
diff --git a/tests/kfdtest/include/kfd_pm4_opcodes.h b/libhsakmt/tests/kfdtest/include/kfd_pm4_opcodes.h
similarity index 100%
rename from tests/kfdtest/include/kfd_pm4_opcodes.h
rename to libhsakmt/tests/kfdtest/include/kfd_pm4_opcodes.h
diff --git a/tests/kfdtest/include/pm4_pkt_struct_ai.h b/libhsakmt/tests/kfdtest/include/pm4_pkt_struct_ai.h
similarity index 100%
rename from tests/kfdtest/include/pm4_pkt_struct_ai.h
rename to libhsakmt/tests/kfdtest/include/pm4_pkt_struct_ai.h
diff --git a/tests/kfdtest/include/pm4_pkt_struct_ci.h b/libhsakmt/tests/kfdtest/include/pm4_pkt_struct_ci.h
similarity index 100%
rename from tests/kfdtest/include/pm4_pkt_struct_ci.h
rename to libhsakmt/tests/kfdtest/include/pm4_pkt_struct_ci.h
diff --git a/tests/kfdtest/include/pm4_pkt_struct_common.h b/libhsakmt/tests/kfdtest/include/pm4_pkt_struct_common.h
similarity index 100%
rename from tests/kfdtest/include/pm4_pkt_struct_common.h
rename to libhsakmt/tests/kfdtest/include/pm4_pkt_struct_common.h
diff --git a/tests/kfdtest/include/pm4_pkt_struct_nv.h b/libhsakmt/tests/kfdtest/include/pm4_pkt_struct_nv.h
similarity index 100%
rename from tests/kfdtest/include/pm4_pkt_struct_nv.h
rename to libhsakmt/tests/kfdtest/include/pm4_pkt_struct_nv.h
diff --git a/tests/kfdtest/include/sdma_pkt_struct.h b/libhsakmt/tests/kfdtest/include/sdma_pkt_struct.h
similarity index 100%
rename from tests/kfdtest/include/sdma_pkt_struct.h
rename to libhsakmt/tests/kfdtest/include/sdma_pkt_struct.h
diff --git a/tests/kfdtest/scripts/kfdtest.exclude b/libhsakmt/tests/kfdtest/scripts/kfdtest.exclude
similarity index 100%
rename from tests/kfdtest/scripts/kfdtest.exclude
rename to libhsakmt/tests/kfdtest/scripts/kfdtest.exclude
diff --git a/tests/kfdtest/scripts/run_kfdtest.sh b/libhsakmt/tests/kfdtest/scripts/run_kfdtest.sh
similarity index 100%
rename from tests/kfdtest/scripts/run_kfdtest.sh
rename to libhsakmt/tests/kfdtest/scripts/run_kfdtest.sh
diff --git a/tests/kfdtest/src/AqlQueue.cpp b/libhsakmt/tests/kfdtest/src/AqlQueue.cpp
similarity index 100%
rename from tests/kfdtest/src/AqlQueue.cpp
rename to libhsakmt/tests/kfdtest/src/AqlQueue.cpp
diff --git a/tests/kfdtest/src/AqlQueue.hpp b/libhsakmt/tests/kfdtest/src/AqlQueue.hpp
similarity index 100%
rename from tests/kfdtest/src/AqlQueue.hpp
rename to libhsakmt/tests/kfdtest/src/AqlQueue.hpp
diff --git a/tests/kfdtest/src/Assemble.cpp b/libhsakmt/tests/kfdtest/src/Assemble.cpp
similarity index 100%
rename from tests/kfdtest/src/Assemble.cpp
rename to libhsakmt/tests/kfdtest/src/Assemble.cpp
diff --git a/tests/kfdtest/src/Assemble.hpp b/libhsakmt/tests/kfdtest/src/Assemble.hpp
similarity index 100%
rename from tests/kfdtest/src/Assemble.hpp
rename to libhsakmt/tests/kfdtest/src/Assemble.hpp
diff --git a/tests/kfdtest/src/BaseDebug.cpp b/libhsakmt/tests/kfdtest/src/BaseDebug.cpp
similarity index 100%
rename from tests/kfdtest/src/BaseDebug.cpp
rename to libhsakmt/tests/kfdtest/src/BaseDebug.cpp
diff --git a/tests/kfdtest/src/BaseDebug.hpp b/libhsakmt/tests/kfdtest/src/BaseDebug.hpp
similarity index 100%
rename from tests/kfdtest/src/BaseDebug.hpp
rename to libhsakmt/tests/kfdtest/src/BaseDebug.hpp
diff --git a/tests/kfdtest/src/BasePacket.cpp b/libhsakmt/tests/kfdtest/src/BasePacket.cpp
similarity index 100%
rename from tests/kfdtest/src/BasePacket.cpp
rename to libhsakmt/tests/kfdtest/src/BasePacket.cpp
diff --git a/tests/kfdtest/src/BasePacket.hpp b/libhsakmt/tests/kfdtest/src/BasePacket.hpp
similarity index 100%
rename from tests/kfdtest/src/BasePacket.hpp
rename to libhsakmt/tests/kfdtest/src/BasePacket.hpp
diff --git a/tests/kfdtest/src/BaseQueue.cpp b/libhsakmt/tests/kfdtest/src/BaseQueue.cpp
similarity index 100%
rename from tests/kfdtest/src/BaseQueue.cpp
rename to libhsakmt/tests/kfdtest/src/BaseQueue.cpp
diff --git a/tests/kfdtest/src/BaseQueue.hpp b/libhsakmt/tests/kfdtest/src/BaseQueue.hpp
similarity index 100%
rename from tests/kfdtest/src/BaseQueue.hpp
rename to libhsakmt/tests/kfdtest/src/BaseQueue.hpp
diff --git a/tests/kfdtest/src/Dispatch.cpp b/libhsakmt/tests/kfdtest/src/Dispatch.cpp
similarity index 100%
rename from tests/kfdtest/src/Dispatch.cpp
rename to libhsakmt/tests/kfdtest/src/Dispatch.cpp
diff --git a/tests/kfdtest/src/Dispatch.hpp b/libhsakmt/tests/kfdtest/src/Dispatch.hpp
similarity index 100%
rename from tests/kfdtest/src/Dispatch.hpp
rename to libhsakmt/tests/kfdtest/src/Dispatch.hpp
diff --git a/tests/kfdtest/src/GoogleTestExtension.cpp b/libhsakmt/tests/kfdtest/src/GoogleTestExtension.cpp
similarity index 100%
rename from tests/kfdtest/src/GoogleTestExtension.cpp
rename to libhsakmt/tests/kfdtest/src/GoogleTestExtension.cpp
diff --git a/tests/kfdtest/src/GoogleTestExtension.hpp b/libhsakmt/tests/kfdtest/src/GoogleTestExtension.hpp
similarity index 100%
rename from tests/kfdtest/src/GoogleTestExtension.hpp
rename to libhsakmt/tests/kfdtest/src/GoogleTestExtension.hpp
diff --git a/tests/kfdtest/src/IndirectBuffer.cpp b/libhsakmt/tests/kfdtest/src/IndirectBuffer.cpp
similarity index 100%
rename from tests/kfdtest/src/IndirectBuffer.cpp
rename to libhsakmt/tests/kfdtest/src/IndirectBuffer.cpp
diff --git a/tests/kfdtest/src/IndirectBuffer.hpp b/libhsakmt/tests/kfdtest/src/IndirectBuffer.hpp
similarity index 100%
rename from tests/kfdtest/src/IndirectBuffer.hpp
rename to libhsakmt/tests/kfdtest/src/IndirectBuffer.hpp
diff --git a/tests/kfdtest/src/KFDASMTest.cpp b/libhsakmt/tests/kfdtest/src/KFDASMTest.cpp
similarity index 100%
rename from tests/kfdtest/src/KFDASMTest.cpp
rename to libhsakmt/tests/kfdtest/src/KFDASMTest.cpp
diff --git a/tests/kfdtest/src/KFDASMTest.hpp b/libhsakmt/tests/kfdtest/src/KFDASMTest.hpp
similarity index 100%
rename from tests/kfdtest/src/KFDASMTest.hpp
rename to libhsakmt/tests/kfdtest/src/KFDASMTest.hpp
diff --git a/tests/kfdtest/src/KFDBaseComponentTest.cpp b/libhsakmt/tests/kfdtest/src/KFDBaseComponentTest.cpp
similarity index 100%
rename from tests/kfdtest/src/KFDBaseComponentTest.cpp
rename to libhsakmt/tests/kfdtest/src/KFDBaseComponentTest.cpp
diff --git a/tests/kfdtest/src/KFDBaseComponentTest.hpp b/libhsakmt/tests/kfdtest/src/KFDBaseComponentTest.hpp
similarity index 100%
rename from tests/kfdtest/src/KFDBaseComponentTest.hpp
rename to libhsakmt/tests/kfdtest/src/KFDBaseComponentTest.hpp
diff --git a/tests/kfdtest/src/KFDCWSRTest.cpp b/libhsakmt/tests/kfdtest/src/KFDCWSRTest.cpp
similarity index 100%
rename from tests/kfdtest/src/KFDCWSRTest.cpp
rename to libhsakmt/tests/kfdtest/src/KFDCWSRTest.cpp
diff --git a/tests/kfdtest/src/KFDCWSRTest.hpp b/libhsakmt/tests/kfdtest/src/KFDCWSRTest.hpp
similarity index 100%
rename from tests/kfdtest/src/KFDCWSRTest.hpp
rename to libhsakmt/tests/kfdtest/src/KFDCWSRTest.hpp
diff --git a/tests/kfdtest/src/KFDDBGTest.cpp b/libhsakmt/tests/kfdtest/src/KFDDBGTest.cpp
similarity index 100%
rename from tests/kfdtest/src/KFDDBGTest.cpp
rename to libhsakmt/tests/kfdtest/src/KFDDBGTest.cpp
diff --git a/tests/kfdtest/src/KFDDBGTest.hpp b/libhsakmt/tests/kfdtest/src/KFDDBGTest.hpp
similarity index 100%
rename from tests/kfdtest/src/KFDDBGTest.hpp
rename to libhsakmt/tests/kfdtest/src/KFDDBGTest.hpp
diff --git a/tests/kfdtest/src/KFDEventTest.cpp b/libhsakmt/tests/kfdtest/src/KFDEventTest.cpp
similarity index 100%
rename from tests/kfdtest/src/KFDEventTest.cpp
rename to libhsakmt/tests/kfdtest/src/KFDEventTest.cpp
diff --git a/tests/kfdtest/src/KFDEventTest.hpp b/libhsakmt/tests/kfdtest/src/KFDEventTest.hpp
similarity index 100%
rename from tests/kfdtest/src/KFDEventTest.hpp
rename to libhsakmt/tests/kfdtest/src/KFDEventTest.hpp
diff --git a/tests/kfdtest/src/KFDEvictTest.cpp b/libhsakmt/tests/kfdtest/src/KFDEvictTest.cpp
similarity index 100%
rename from tests/kfdtest/src/KFDEvictTest.cpp
rename to libhsakmt/tests/kfdtest/src/KFDEvictTest.cpp
diff --git a/tests/kfdtest/src/KFDEvictTest.hpp b/libhsakmt/tests/kfdtest/src/KFDEvictTest.hpp
similarity index 100%
rename from tests/kfdtest/src/KFDEvictTest.hpp
rename to libhsakmt/tests/kfdtest/src/KFDEvictTest.hpp
diff --git a/tests/kfdtest/src/KFDExceptionTest.cpp b/libhsakmt/tests/kfdtest/src/KFDExceptionTest.cpp
similarity index 100%
rename from tests/kfdtest/src/KFDExceptionTest.cpp
rename to libhsakmt/tests/kfdtest/src/KFDExceptionTest.cpp
diff --git a/tests/kfdtest/src/KFDExceptionTest.hpp b/libhsakmt/tests/kfdtest/src/KFDExceptionTest.hpp
similarity index 100%
rename from tests/kfdtest/src/KFDExceptionTest.hpp
rename to libhsakmt/tests/kfdtest/src/KFDExceptionTest.hpp
diff --git a/tests/kfdtest/src/KFDGWSTest.cpp b/libhsakmt/tests/kfdtest/src/KFDGWSTest.cpp
similarity index 100%
rename from tests/kfdtest/src/KFDGWSTest.cpp
rename to libhsakmt/tests/kfdtest/src/KFDGWSTest.cpp
diff --git a/tests/kfdtest/src/KFDGWSTest.hpp b/libhsakmt/tests/kfdtest/src/KFDGWSTest.hpp
similarity index 100%
rename from tests/kfdtest/src/KFDGWSTest.hpp
rename to libhsakmt/tests/kfdtest/src/KFDGWSTest.hpp
diff --git a/tests/kfdtest/src/KFDGraphicsInterop.cpp b/libhsakmt/tests/kfdtest/src/KFDGraphicsInterop.cpp
similarity index 100%
rename from tests/kfdtest/src/KFDGraphicsInterop.cpp
rename to libhsakmt/tests/kfdtest/src/KFDGraphicsInterop.cpp
diff --git a/tests/kfdtest/src/KFDGraphicsInterop.hpp b/libhsakmt/tests/kfdtest/src/KFDGraphicsInterop.hpp
similarity index 100%
rename from tests/kfdtest/src/KFDGraphicsInterop.hpp
rename to libhsakmt/tests/kfdtest/src/KFDGraphicsInterop.hpp
diff --git a/tests/kfdtest/src/KFDHWSTest.cpp b/libhsakmt/tests/kfdtest/src/KFDHWSTest.cpp
similarity index 100%
rename from tests/kfdtest/src/KFDHWSTest.cpp
rename to libhsakmt/tests/kfdtest/src/KFDHWSTest.cpp
diff --git a/tests/kfdtest/src/KFDHWSTest.hpp b/libhsakmt/tests/kfdtest/src/KFDHWSTest.hpp
similarity index 100%
rename from tests/kfdtest/src/KFDHWSTest.hpp
rename to libhsakmt/tests/kfdtest/src/KFDHWSTest.hpp
diff --git a/tests/kfdtest/src/KFDIPCTest.cpp b/libhsakmt/tests/kfdtest/src/KFDIPCTest.cpp
similarity index 100%
rename from tests/kfdtest/src/KFDIPCTest.cpp
rename to libhsakmt/tests/kfdtest/src/KFDIPCTest.cpp
diff --git a/tests/kfdtest/src/KFDIPCTest.hpp b/libhsakmt/tests/kfdtest/src/KFDIPCTest.hpp
similarity index 100%
rename from tests/kfdtest/src/KFDIPCTest.hpp
rename to libhsakmt/tests/kfdtest/src/KFDIPCTest.hpp
diff --git a/tests/kfdtest/src/KFDLocalMemoryTest.cpp b/libhsakmt/tests/kfdtest/src/KFDLocalMemoryTest.cpp
similarity index 100%
rename from tests/kfdtest/src/KFDLocalMemoryTest.cpp
rename to libhsakmt/tests/kfdtest/src/KFDLocalMemoryTest.cpp
diff --git a/tests/kfdtest/src/KFDLocalMemoryTest.hpp b/libhsakmt/tests/kfdtest/src/KFDLocalMemoryTest.hpp
similarity index 100%
rename from tests/kfdtest/src/KFDLocalMemoryTest.hpp
rename to libhsakmt/tests/kfdtest/src/KFDLocalMemoryTest.hpp
diff --git a/tests/kfdtest/src/KFDMemoryTest.cpp b/libhsakmt/tests/kfdtest/src/KFDMemoryTest.cpp
similarity index 100%
rename from tests/kfdtest/src/KFDMemoryTest.cpp
rename to libhsakmt/tests/kfdtest/src/KFDMemoryTest.cpp
diff --git a/tests/kfdtest/src/KFDMemoryTest.hpp b/libhsakmt/tests/kfdtest/src/KFDMemoryTest.hpp
similarity index 100%
rename from tests/kfdtest/src/KFDMemoryTest.hpp
rename to libhsakmt/tests/kfdtest/src/KFDMemoryTest.hpp
diff --git a/tests/kfdtest/src/KFDMultiProcessTest.cpp b/libhsakmt/tests/kfdtest/src/KFDMultiProcessTest.cpp
similarity index 100%
rename from tests/kfdtest/src/KFDMultiProcessTest.cpp
rename to libhsakmt/tests/kfdtest/src/KFDMultiProcessTest.cpp
diff --git a/tests/kfdtest/src/KFDMultiProcessTest.hpp b/libhsakmt/tests/kfdtest/src/KFDMultiProcessTest.hpp
similarity index 100%
rename from tests/kfdtest/src/KFDMultiProcessTest.hpp
rename to libhsakmt/tests/kfdtest/src/KFDMultiProcessTest.hpp
diff --git a/tests/kfdtest/src/KFDOpenCloseKFDTest.cpp b/libhsakmt/tests/kfdtest/src/KFDOpenCloseKFDTest.cpp
similarity index 100%
rename from tests/kfdtest/src/KFDOpenCloseKFDTest.cpp
rename to libhsakmt/tests/kfdtest/src/KFDOpenCloseKFDTest.cpp
diff --git a/tests/kfdtest/src/KFDOpenCloseKFDTest.hpp b/libhsakmt/tests/kfdtest/src/KFDOpenCloseKFDTest.hpp
similarity index 100%
rename from tests/kfdtest/src/KFDOpenCloseKFDTest.hpp
rename to libhsakmt/tests/kfdtest/src/KFDOpenCloseKFDTest.hpp
diff --git a/tests/kfdtest/src/KFDPCSamplingTest.cpp b/libhsakmt/tests/kfdtest/src/KFDPCSamplingTest.cpp
similarity index 100%
rename from tests/kfdtest/src/KFDPCSamplingTest.cpp
rename to libhsakmt/tests/kfdtest/src/KFDPCSamplingTest.cpp
diff --git a/tests/kfdtest/src/KFDPCSamplingTest.hpp b/libhsakmt/tests/kfdtest/src/KFDPCSamplingTest.hpp
similarity index 100%
rename from tests/kfdtest/src/KFDPCSamplingTest.hpp
rename to libhsakmt/tests/kfdtest/src/KFDPCSamplingTest.hpp
diff --git a/tests/kfdtest/src/KFDPMTest.cpp b/libhsakmt/tests/kfdtest/src/KFDPMTest.cpp
similarity index 100%
rename from tests/kfdtest/src/KFDPMTest.cpp
rename to libhsakmt/tests/kfdtest/src/KFDPMTest.cpp
diff --git a/tests/kfdtest/src/KFDPMTest.hpp b/libhsakmt/tests/kfdtest/src/KFDPMTest.hpp
similarity index 100%
rename from tests/kfdtest/src/KFDPMTest.hpp
rename to libhsakmt/tests/kfdtest/src/KFDPMTest.hpp
diff --git a/tests/kfdtest/src/KFDPerfCounters.cpp b/libhsakmt/tests/kfdtest/src/KFDPerfCounters.cpp
similarity index 100%
rename from tests/kfdtest/src/KFDPerfCounters.cpp
rename to libhsakmt/tests/kfdtest/src/KFDPerfCounters.cpp
diff --git a/tests/kfdtest/src/KFDPerfCounters.hpp b/libhsakmt/tests/kfdtest/src/KFDPerfCounters.hpp
similarity index 100%
rename from tests/kfdtest/src/KFDPerfCounters.hpp
rename to libhsakmt/tests/kfdtest/src/KFDPerfCounters.hpp
diff --git a/tests/kfdtest/src/KFDPerformanceTest.cpp b/libhsakmt/tests/kfdtest/src/KFDPerformanceTest.cpp
similarity index 100%
rename from tests/kfdtest/src/KFDPerformanceTest.cpp
rename to libhsakmt/tests/kfdtest/src/KFDPerformanceTest.cpp
diff --git a/tests/kfdtest/src/KFDQMTest.cpp b/libhsakmt/tests/kfdtest/src/KFDQMTest.cpp
similarity index 100%
rename from tests/kfdtest/src/KFDQMTest.cpp
rename to libhsakmt/tests/kfdtest/src/KFDQMTest.cpp
diff --git a/tests/kfdtest/src/KFDQMTest.hpp b/libhsakmt/tests/kfdtest/src/KFDQMTest.hpp
similarity index 100%
rename from tests/kfdtest/src/KFDQMTest.hpp
rename to libhsakmt/tests/kfdtest/src/KFDQMTest.hpp
diff --git a/tests/kfdtest/src/KFDRASTest.cpp b/libhsakmt/tests/kfdtest/src/KFDRASTest.cpp
similarity index 100%
rename from tests/kfdtest/src/KFDRASTest.cpp
rename to libhsakmt/tests/kfdtest/src/KFDRASTest.cpp
diff --git a/tests/kfdtest/src/KFDRASTest.hpp b/libhsakmt/tests/kfdtest/src/KFDRASTest.hpp
similarity index 100%
rename from tests/kfdtest/src/KFDRASTest.hpp
rename to libhsakmt/tests/kfdtest/src/KFDRASTest.hpp
diff --git a/tests/kfdtest/src/KFDSVMEvictTest.cpp b/libhsakmt/tests/kfdtest/src/KFDSVMEvictTest.cpp
similarity index 100%
rename from tests/kfdtest/src/KFDSVMEvictTest.cpp
rename to libhsakmt/tests/kfdtest/src/KFDSVMEvictTest.cpp
diff --git a/tests/kfdtest/src/KFDSVMEvictTest.hpp b/libhsakmt/tests/kfdtest/src/KFDSVMEvictTest.hpp
similarity index 100%
rename from tests/kfdtest/src/KFDSVMEvictTest.hpp
rename to libhsakmt/tests/kfdtest/src/KFDSVMEvictTest.hpp
diff --git a/tests/kfdtest/src/KFDSVMRangeTest.cpp b/libhsakmt/tests/kfdtest/src/KFDSVMRangeTest.cpp
similarity index 100%
rename from tests/kfdtest/src/KFDSVMRangeTest.cpp
rename to libhsakmt/tests/kfdtest/src/KFDSVMRangeTest.cpp
diff --git a/tests/kfdtest/src/KFDSVMRangeTest.hpp b/libhsakmt/tests/kfdtest/src/KFDSVMRangeTest.hpp
similarity index 100%
rename from tests/kfdtest/src/KFDSVMRangeTest.hpp
rename to libhsakmt/tests/kfdtest/src/KFDSVMRangeTest.hpp
diff --git a/tests/kfdtest/src/KFDTestFlags.hpp b/libhsakmt/tests/kfdtest/src/KFDTestFlags.hpp
similarity index 100%
rename from tests/kfdtest/src/KFDTestFlags.hpp
rename to libhsakmt/tests/kfdtest/src/KFDTestFlags.hpp
diff --git a/tests/kfdtest/src/KFDTestMain.cpp b/libhsakmt/tests/kfdtest/src/KFDTestMain.cpp
similarity index 100%
rename from tests/kfdtest/src/KFDTestMain.cpp
rename to libhsakmt/tests/kfdtest/src/KFDTestMain.cpp
diff --git a/tests/kfdtest/src/KFDTestUtil.cpp b/libhsakmt/tests/kfdtest/src/KFDTestUtil.cpp
similarity index 100%
rename from tests/kfdtest/src/KFDTestUtil.cpp
rename to libhsakmt/tests/kfdtest/src/KFDTestUtil.cpp
diff --git a/tests/kfdtest/src/KFDTestUtil.hpp b/libhsakmt/tests/kfdtest/src/KFDTestUtil.hpp
similarity index 100%
rename from tests/kfdtest/src/KFDTestUtil.hpp
rename to libhsakmt/tests/kfdtest/src/KFDTestUtil.hpp
diff --git a/tests/kfdtest/src/KFDTestUtilQueue.cpp b/libhsakmt/tests/kfdtest/src/KFDTestUtilQueue.cpp
similarity index 100%
rename from tests/kfdtest/src/KFDTestUtilQueue.cpp
rename to libhsakmt/tests/kfdtest/src/KFDTestUtilQueue.cpp
diff --git a/tests/kfdtest/src/KFDTestUtilQueue.hpp b/libhsakmt/tests/kfdtest/src/KFDTestUtilQueue.hpp
similarity index 100%
rename from tests/kfdtest/src/KFDTestUtilQueue.hpp
rename to libhsakmt/tests/kfdtest/src/KFDTestUtilQueue.hpp
diff --git a/tests/kfdtest/src/KFDTopologyTest.cpp b/libhsakmt/tests/kfdtest/src/KFDTopologyTest.cpp
similarity index 100%
rename from tests/kfdtest/src/KFDTopologyTest.cpp
rename to libhsakmt/tests/kfdtest/src/KFDTopologyTest.cpp
diff --git a/tests/kfdtest/src/KFDTopologyTest.hpp b/libhsakmt/tests/kfdtest/src/KFDTopologyTest.hpp
similarity index 100%
rename from tests/kfdtest/src/KFDTopologyTest.hpp
rename to libhsakmt/tests/kfdtest/src/KFDTopologyTest.hpp
diff --git a/tests/kfdtest/src/LinuxOSWrapper.cpp b/libhsakmt/tests/kfdtest/src/LinuxOSWrapper.cpp
similarity index 100%
rename from tests/kfdtest/src/LinuxOSWrapper.cpp
rename to libhsakmt/tests/kfdtest/src/LinuxOSWrapper.cpp
diff --git a/tests/kfdtest/src/OSWrapper.hpp b/libhsakmt/tests/kfdtest/src/OSWrapper.hpp
similarity index 100%
rename from tests/kfdtest/src/OSWrapper.hpp
rename to libhsakmt/tests/kfdtest/src/OSWrapper.hpp
diff --git a/tests/kfdtest/src/PM4Packet.cpp b/libhsakmt/tests/kfdtest/src/PM4Packet.cpp
similarity index 100%
rename from tests/kfdtest/src/PM4Packet.cpp
rename to libhsakmt/tests/kfdtest/src/PM4Packet.cpp
diff --git a/tests/kfdtest/src/PM4Packet.hpp b/libhsakmt/tests/kfdtest/src/PM4Packet.hpp
similarity index 100%
rename from tests/kfdtest/src/PM4Packet.hpp
rename to libhsakmt/tests/kfdtest/src/PM4Packet.hpp
diff --git a/tests/kfdtest/src/PM4Queue.cpp b/libhsakmt/tests/kfdtest/src/PM4Queue.cpp
similarity index 100%
rename from tests/kfdtest/src/PM4Queue.cpp
rename to libhsakmt/tests/kfdtest/src/PM4Queue.cpp
diff --git a/tests/kfdtest/src/PM4Queue.hpp b/libhsakmt/tests/kfdtest/src/PM4Queue.hpp
similarity index 100%
rename from tests/kfdtest/src/PM4Queue.hpp
rename to libhsakmt/tests/kfdtest/src/PM4Queue.hpp
diff --git a/tests/kfdtest/src/RDMATest.cpp b/libhsakmt/tests/kfdtest/src/RDMATest.cpp
similarity index 100%
rename from tests/kfdtest/src/RDMATest.cpp
rename to libhsakmt/tests/kfdtest/src/RDMATest.cpp
diff --git a/tests/kfdtest/src/RDMATest.hpp b/libhsakmt/tests/kfdtest/src/RDMATest.hpp
similarity index 100%
rename from tests/kfdtest/src/RDMATest.hpp
rename to libhsakmt/tests/kfdtest/src/RDMATest.hpp
diff --git a/tests/kfdtest/src/RDMAUtil.cpp b/libhsakmt/tests/kfdtest/src/RDMAUtil.cpp
similarity index 100%
rename from tests/kfdtest/src/RDMAUtil.cpp
rename to libhsakmt/tests/kfdtest/src/RDMAUtil.cpp
diff --git a/tests/kfdtest/src/RDMAUtil.hpp b/libhsakmt/tests/kfdtest/src/RDMAUtil.hpp
similarity index 100%
rename from tests/kfdtest/src/RDMAUtil.hpp
rename to libhsakmt/tests/kfdtest/src/RDMAUtil.hpp
diff --git a/tests/kfdtest/src/SDMAPacket.cpp b/libhsakmt/tests/kfdtest/src/SDMAPacket.cpp
similarity index 100%
rename from tests/kfdtest/src/SDMAPacket.cpp
rename to libhsakmt/tests/kfdtest/src/SDMAPacket.cpp
diff --git a/tests/kfdtest/src/SDMAPacket.hpp b/libhsakmt/tests/kfdtest/src/SDMAPacket.hpp
similarity index 100%
rename from tests/kfdtest/src/SDMAPacket.hpp
rename to libhsakmt/tests/kfdtest/src/SDMAPacket.hpp
diff --git a/tests/kfdtest/src/SDMAQueue.cpp b/libhsakmt/tests/kfdtest/src/SDMAQueue.cpp
similarity index 100%
rename from tests/kfdtest/src/SDMAQueue.cpp
rename to libhsakmt/tests/kfdtest/src/SDMAQueue.cpp
diff --git a/tests/kfdtest/src/SDMAQueue.hpp b/libhsakmt/tests/kfdtest/src/SDMAQueue.hpp
similarity index 100%
rename from tests/kfdtest/src/SDMAQueue.hpp
rename to libhsakmt/tests/kfdtest/src/SDMAQueue.hpp
diff --git a/tests/kfdtest/src/ShaderStore.cpp b/libhsakmt/tests/kfdtest/src/ShaderStore.cpp
similarity index 100%
rename from tests/kfdtest/src/ShaderStore.cpp
rename to libhsakmt/tests/kfdtest/src/ShaderStore.cpp
diff --git a/tests/kfdtest/src/ShaderStore.hpp b/libhsakmt/tests/kfdtest/src/ShaderStore.hpp
similarity index 100%
rename from tests/kfdtest/src/ShaderStore.hpp
rename to libhsakmt/tests/kfdtest/src/ShaderStore.hpp
diff --git a/tests/kfdtest/src/XgmiOptimizedSDMAQueue.hpp b/libhsakmt/tests/kfdtest/src/XgmiOptimizedSDMAQueue.hpp
similarity index 100%
rename from tests/kfdtest/src/XgmiOptimizedSDMAQueue.hpp
rename to libhsakmt/tests/kfdtest/src/XgmiOptimizedSDMAQueue.hpp
diff --git a/tests/rdma/simple/app/CMakeLists.txt b/libhsakmt/tests/rdma/simple/app/CMakeLists.txt
similarity index 100%
rename from tests/rdma/simple/app/CMakeLists.txt
rename to libhsakmt/tests/rdma/simple/app/CMakeLists.txt
diff --git a/tests/rdma/simple/app/rdma_test.cpp b/libhsakmt/tests/rdma/simple/app/rdma_test.cpp
similarity index 100%
rename from tests/rdma/simple/app/rdma_test.cpp
rename to libhsakmt/tests/rdma/simple/app/rdma_test.cpp
diff --git a/tests/rdma/simple/drv/Makefile b/libhsakmt/tests/rdma/simple/drv/Makefile
similarity index 100%
rename from tests/rdma/simple/drv/Makefile
rename to libhsakmt/tests/rdma/simple/drv/Makefile
diff --git a/tests/rdma/simple/drv/amdp2ptest.c b/libhsakmt/tests/rdma/simple/drv/amdp2ptest.c
similarity index 100%
rename from tests/rdma/simple/drv/amdp2ptest.c
rename to libhsakmt/tests/rdma/simple/drv/amdp2ptest.c
diff --git a/tests/rdma/simple/drv/amdp2ptest.h b/libhsakmt/tests/rdma/simple/drv/amdp2ptest.h
similarity index 100%
rename from tests/rdma/simple/drv/amdp2ptest.h
rename to libhsakmt/tests/rdma/simple/drv/amdp2ptest.h
diff --git a/tests/reopen/CMakeLists.txt b/libhsakmt/tests/reopen/CMakeLists.txt
similarity index 100%
rename from tests/reopen/CMakeLists.txt
rename to libhsakmt/tests/reopen/CMakeLists.txt
diff --git a/tests/reopen/kmtreopen.c b/libhsakmt/tests/reopen/kmtreopen.c
similarity index 100%
rename from tests/reopen/kmtreopen.c
rename to libhsakmt/tests/reopen/kmtreopen.c