diff --git a/devicemodel/tools/acrn-manager/Makefile b/tools/acrn-manager/Makefile
similarity index 100%
rename from devicemodel/tools/acrn-manager/Makefile
rename to tools/acrn-manager/Makefile
diff --git a/devicemodel/tools/acrn-manager/README.rst b/tools/acrn-manager/README.rst
similarity index 100%
rename from devicemodel/tools/acrn-manager/README.rst
rename to tools/acrn-manager/README.rst
diff --git a/devicemodel/tools/acrn-manager/acrnctl.c b/tools/acrn-manager/acrnctl.c
similarity index 100%
rename from devicemodel/tools/acrn-manager/acrnctl.c
rename to tools/acrn-manager/acrnctl.c
diff --git a/devicemodel/tools/acrnlog/Makefile b/tools/acrnlog/Makefile
similarity index 100%
rename from devicemodel/tools/acrnlog/Makefile
rename to tools/acrnlog/Makefile
diff --git a/devicemodel/tools/acrnlog/README.rst b/tools/acrnlog/README.rst
similarity index 100%
rename from devicemodel/tools/acrnlog/README.rst
rename to tools/acrnlog/README.rst
diff --git a/devicemodel/tools/acrnlog/acrnlog.c b/tools/acrnlog/acrnlog.c
similarity index 100%
rename from devicemodel/tools/acrnlog/acrnlog.c
rename to tools/acrnlog/acrnlog.c
diff --git a/devicemodel/tools/acrnlog/acrnlog.service b/tools/acrnlog/acrnlog.service
similarity index 100%
rename from devicemodel/tools/acrnlog/acrnlog.service
rename to tools/acrnlog/acrnlog.service
diff --git a/devicemodel/tools/acrntrace/Makefile b/tools/acrntrace/Makefile
similarity index 100%
rename from devicemodel/tools/acrntrace/Makefile
rename to tools/acrntrace/Makefile
diff --git a/devicemodel/tools/acrntrace/README.rst b/tools/acrntrace/README.rst
similarity index 100%
rename from devicemodel/tools/acrntrace/README.rst
rename to tools/acrntrace/README.rst
diff --git a/devicemodel/tools/acrntrace/acrntrace.c b/tools/acrntrace/acrntrace.c
similarity index 100%
rename from devicemodel/tools/acrntrace/acrntrace.c
rename to tools/acrntrace/acrntrace.c
diff --git a/devicemodel/tools/acrntrace/acrntrace.h b/tools/acrntrace/acrntrace.h
similarity index 100%
rename from devicemodel/tools/acrntrace/acrntrace.h
rename to tools/acrntrace/acrntrace.h
diff --git a/devicemodel/tools/acrntrace/sbuf.c b/tools/acrntrace/sbuf.c
similarity index 100%
rename from devicemodel/tools/acrntrace/sbuf.c
rename to tools/acrntrace/sbuf.c
diff --git a/devicemodel/tools/acrntrace/sbuf.h b/tools/acrntrace/sbuf.h
similarity index 100%
rename from devicemodel/tools/acrntrace/sbuf.h
rename to tools/acrntrace/sbuf.h
diff --git a/devicemodel/tools/acrntrace/scripts/acrnalyze.py b/tools/acrntrace/scripts/acrnalyze.py
similarity index 100%
rename from devicemodel/tools/acrntrace/scripts/acrnalyze.py
rename to tools/acrntrace/scripts/acrnalyze.py
diff --git a/devicemodel/tools/acrntrace/scripts/pre_process.sh b/tools/acrntrace/scripts/pre_process.sh
similarity index 100%
rename from devicemodel/tools/acrntrace/scripts/pre_process.sh
rename to tools/acrntrace/scripts/pre_process.sh
diff --git a/devicemodel/tools/acrntrace/scripts/vmexit_analyze.py b/tools/acrntrace/scripts/vmexit_analyze.py
similarity index 100%
rename from devicemodel/tools/acrntrace/scripts/vmexit_analyze.py
rename to tools/acrntrace/scripts/vmexit_analyze.py
diff --git a/devicemodel/tools/acrntrace/trace_event.h b/tools/acrntrace/trace_event.h
similarity index 100%
rename from devicemodel/tools/acrntrace/trace_event.h
rename to tools/acrntrace/trace_event.h