From b2f1326437b9895a1a511fcfdd1d9135dcc27c44 Mon Sep 17 00:00:00 2001
From: Thomas Huth <thuth@redhat.com>
Date: Thu, 1 Mar 2018 22:35:33 -0500
Subject: [PATCH] Move target-* CPU file into a target/ folder

We've currently got 18 architectures in QEMU, and thus 18 target-xxx
folders in the root folder of the QEMU source tree. More architectures
(e.g. RISC-V, AVR) are likely to be included soon, too, so the main
folder of the QEMU sources slowly gets quite overcrowded with the
target-xxx folders.
To disburden the main folder a little bit, let's move the target-xxx
folders into a dedicated target/ folder, so that target-xxx/ simply
becomes target/xxx/ instead.

Backports commit fcf5ef2ab52c621a4617ebbef36bf43b4003f4c0 from qemu
---
 .../aarch64-softmmu/aarch64-softmmu.vcxproj   | 52 +++++------
 .../aarch64-softmmu.vcxproj.filters           | 90 +++++++++----------
 .../aarch64eb-softmmu.vcxproj                 | 52 +++++------
 .../aarch64eb-softmmu.vcxproj.filters         | 90 +++++++++----------
 msvc/unicorn/arm-softmmu/arm-softmmu.vcxproj  | 44 ++++-----
 .../armeb-softmmu/armeb-softmmu.vcxproj       | 44 ++++-----
 .../unicorn/m68k-softmmu/m68k-softmmu.vcxproj | 28 +++---
 .../m68k-softmmu/m68k-softmmu.vcxproj.filters | 42 ++++-----
 .../unicorn/mips-softmmu/mips-softmmu.vcxproj | 36 ++++----
 .../mips-softmmu/mips-softmmu.vcxproj.filters | 58 ++++++------
 .../mips64-softmmu/mips64-softmmu.vcxproj     | 36 ++++----
 .../mips64-softmmu.vcxproj.filters            | 58 ++++++------
 .../mips64el-softmmu/mips64el-softmmu.vcxproj | 36 ++++----
 .../mips64el-softmmu.vcxproj.filters          | 58 ++++++------
 .../mipsel-softmmu/mipsel-softmmu.vcxproj     | 36 ++++----
 .../mipsel-softmmu.vcxproj.filters            | 58 ++++++------
 .../sparc-softmmu/sparc-softmmu.vcxproj       | 38 ++++----
 .../sparc-softmmu.vcxproj.filters             | 62 ++++++-------
 .../sparc64-softmmu/sparc64-softmmu.vcxproj   | 40 ++++-----
 .../sparc64-softmmu.vcxproj.filters           | 66 +++++++-------
 .../x86_64-softmmu/x86_64-softmmu.vcxproj     | 60 ++++++-------
 qemu/Makefile.target                          |  4 +-
 qemu/include/hw/arm/arm.h                     |  2 +-
 qemu/{target-arm => target/arm}/Makefile.objs |  0
 qemu/{target-arm => target/arm}/arm_ldst.h    |  0
 qemu/{target-arm => target/arm}/cpu-qom.h     |  0
 qemu/{target-arm => target/arm}/cpu.c         |  0
 qemu/{target-arm => target/arm}/cpu.h         |  0
 qemu/{target-arm => target/arm}/cpu64.c       |  0
 .../arm}/crypto_helper.c                      |  0
 qemu/{target-arm => target/arm}/helper-a64.c  |  0
 qemu/{target-arm => target/arm}/helper-a64.h  |  0
 qemu/{target-arm => target/arm}/helper.c      |  0
 qemu/{target-arm => target/arm}/helper.h      |  0
 qemu/{target-arm => target/arm}/internals.h   |  2 +-
 .../arm}/iwmmxt_helper.c                      |  0
 qemu/{target-arm => target/arm}/kvm-consts.h  |  0
 qemu/{target-arm => target/arm}/neon_helper.c |  0
 qemu/{target-arm => target/arm}/op_addsub.h   |  0
 qemu/{target-arm => target/arm}/op_helper.c   |  0
 qemu/{target-arm => target/arm}/psci.c        |  0
 .../arm}/translate-a64.c                      |  0
 qemu/{target-arm => target/arm}/translate.c   |  0
 qemu/{target-arm => target/arm}/translate.h   |  0
 qemu/{target-arm => target/arm}/unicorn.h     |  0
 .../arm}/unicorn_aarch64.c                    |  0
 qemu/{target-arm => target/arm}/unicorn_arm.c |  0
 .../i386}/Makefile.objs                       |  0
 qemu/{target-i386 => target/i386}/TODO        |  0
 .../i386}/arch_memory_mapping.c               |  0
 .../{target-i386 => target/i386}/bpt_helper.c |  0
 qemu/{target-i386 => target/i386}/cc_helper.c |  0
 .../i386}/cc_helper_template.h                |  0
 qemu/{target-i386 => target/i386}/cpu-qom.h   |  0
 qemu/{target-i386 => target/i386}/cpu.c       |  0
 qemu/{target-i386 => target/i386}/cpu.h       |  0
 .../i386}/excp_helper.c                       |  0
 .../{target-i386 => target/i386}/fpu_helper.c |  0
 qemu/{target-i386 => target/i386}/helper.c    |  0
 qemu/{target-i386 => target/i386}/helper.h    |  0
 .../{target-i386 => target/i386}/int_helper.c |  0
 .../{target-i386 => target/i386}/mem_helper.c |  0
 .../i386}/misc_helper.c                       |  0
 .../{target-i386 => target/i386}/mpx_helper.c |  0
 qemu/{target-i386 => target/i386}/ops_sse.h   |  0
 .../i386}/ops_sse_header.h                    |  0
 .../{target-i386 => target/i386}/seg_helper.c |  0
 .../i386}/shift_helper_template.h             |  0
 .../{target-i386 => target/i386}/smm_helper.c |  0
 qemu/{target-i386 => target/i386}/svm.h       |  0
 .../{target-i386 => target/i386}/svm_helper.c |  0
 qemu/{target-i386 => target/i386}/topology.h  |  0
 qemu/{target-i386 => target/i386}/translate.c |  0
 qemu/{target-i386 => target/i386}/unicorn.c   |  0
 qemu/{target-i386 => target/i386}/unicorn.h   |  0
 .../m68k}/Makefile.objs                       |  0
 qemu/{target-m68k => target/m68k}/cpu-qom.h   |  0
 qemu/{target-m68k => target/m68k}/cpu.c       |  0
 qemu/{target-m68k => target/m68k}/cpu.h       |  0
 qemu/{target-m68k => target/m68k}/helper.c    |  0
 qemu/{target-m68k => target/m68k}/helper.h    |  0
 qemu/{target-m68k => target/m68k}/op_helper.c |  0
 qemu/{target-m68k => target/m68k}/qregs.def   |  0
 qemu/{target-m68k => target/m68k}/translate.c |  0
 qemu/{target-m68k => target/m68k}/unicorn.c   |  0
 qemu/{target-m68k => target/m68k}/unicorn.h   |  0
 .../mips}/Makefile.objs                       |  0
 qemu/{target-mips => target/mips}/TODO        |  0
 qemu/{target-mips => target/mips}/cpu-qom.h   |  0
 qemu/{target-mips => target/mips}/cpu.c       |  0
 qemu/{target-mips => target/mips}/cpu.h       |  0
 .../{target-mips => target/mips}/dsp_helper.c |  0
 qemu/{target-mips => target/mips}/helper.c    |  0
 qemu/{target-mips => target/mips}/helper.h    |  0
 .../{target-mips => target/mips}/lmi_helper.c |  0
 qemu/{target-mips => target/mips}/mips-defs.h |  0
 .../{target-mips => target/mips}/msa_helper.c |  0
 qemu/{target-mips => target/mips}/op_helper.c |  0
 qemu/{target-mips => target/mips}/translate.c |  0
 .../mips}/translate_init.c                    |  0
 qemu/{target-mips => target/mips}/unicorn.c   |  0
 qemu/{target-mips => target/mips}/unicorn.h   |  0
 .../sparc}/Makefile.objs                      |  0
 qemu/{target-sparc => target/sparc}/TODO      |  0
 qemu/{target-sparc => target/sparc}/asi.h     |  0
 .../sparc}/cc_helper.c                        |  0
 qemu/{target-sparc => target/sparc}/cpu-qom.h |  0
 qemu/{target-sparc => target/sparc}/cpu.c     |  0
 qemu/{target-sparc => target/sparc}/cpu.h     |  0
 .../sparc}/fop_helper.c                       |  0
 qemu/{target-sparc => target/sparc}/helper.c  |  0
 qemu/{target-sparc => target/sparc}/helper.h  |  0
 .../sparc}/int32_helper.c                     |  0
 .../sparc}/int64_helper.c                     |  0
 .../sparc}/ldst_helper.c                      |  0
 .../sparc}/mmu_helper.c                       |  0
 .../sparc}/translate.c                        |  0
 qemu/{target-sparc => target/sparc}/unicorn.c |  0
 qemu/{target-sparc => target/sparc}/unicorn.h |  0
 .../sparc}/unicorn64.c                        |  0
 .../sparc}/vis_helper.c                       |  0
 .../sparc}/win_helper.c                       |  0
 uc.c                                          | 10 +--
 123 files changed, 551 insertions(+), 551 deletions(-)
 rename qemu/{target-arm => target/arm}/Makefile.objs (100%)
 rename qemu/{target-arm => target/arm}/arm_ldst.h (100%)
 rename qemu/{target-arm => target/arm}/cpu-qom.h (100%)
 rename qemu/{target-arm => target/arm}/cpu.c (100%)
 rename qemu/{target-arm => target/arm}/cpu.h (100%)
 rename qemu/{target-arm => target/arm}/cpu64.c (100%)
 rename qemu/{target-arm => target/arm}/crypto_helper.c (100%)
 rename qemu/{target-arm => target/arm}/helper-a64.c (100%)
 rename qemu/{target-arm => target/arm}/helper-a64.h (100%)
 rename qemu/{target-arm => target/arm}/helper.c (100%)
 rename qemu/{target-arm => target/arm}/helper.h (100%)
 rename qemu/{target-arm => target/arm}/internals.h (99%)
 rename qemu/{target-arm => target/arm}/iwmmxt_helper.c (100%)
 rename qemu/{target-arm => target/arm}/kvm-consts.h (100%)
 rename qemu/{target-arm => target/arm}/neon_helper.c (100%)
 rename qemu/{target-arm => target/arm}/op_addsub.h (100%)
 rename qemu/{target-arm => target/arm}/op_helper.c (100%)
 rename qemu/{target-arm => target/arm}/psci.c (100%)
 rename qemu/{target-arm => target/arm}/translate-a64.c (100%)
 rename qemu/{target-arm => target/arm}/translate.c (100%)
 rename qemu/{target-arm => target/arm}/translate.h (100%)
 rename qemu/{target-arm => target/arm}/unicorn.h (100%)
 rename qemu/{target-arm => target/arm}/unicorn_aarch64.c (100%)
 rename qemu/{target-arm => target/arm}/unicorn_arm.c (100%)
 rename qemu/{target-i386 => target/i386}/Makefile.objs (100%)
 rename qemu/{target-i386 => target/i386}/TODO (100%)
 rename qemu/{target-i386 => target/i386}/arch_memory_mapping.c (100%)
 rename qemu/{target-i386 => target/i386}/bpt_helper.c (100%)
 rename qemu/{target-i386 => target/i386}/cc_helper.c (100%)
 rename qemu/{target-i386 => target/i386}/cc_helper_template.h (100%)
 rename qemu/{target-i386 => target/i386}/cpu-qom.h (100%)
 rename qemu/{target-i386 => target/i386}/cpu.c (100%)
 rename qemu/{target-i386 => target/i386}/cpu.h (100%)
 rename qemu/{target-i386 => target/i386}/excp_helper.c (100%)
 rename qemu/{target-i386 => target/i386}/fpu_helper.c (100%)
 rename qemu/{target-i386 => target/i386}/helper.c (100%)
 rename qemu/{target-i386 => target/i386}/helper.h (100%)
 rename qemu/{target-i386 => target/i386}/int_helper.c (100%)
 rename qemu/{target-i386 => target/i386}/mem_helper.c (100%)
 rename qemu/{target-i386 => target/i386}/misc_helper.c (100%)
 rename qemu/{target-i386 => target/i386}/mpx_helper.c (100%)
 rename qemu/{target-i386 => target/i386}/ops_sse.h (100%)
 rename qemu/{target-i386 => target/i386}/ops_sse_header.h (100%)
 rename qemu/{target-i386 => target/i386}/seg_helper.c (100%)
 rename qemu/{target-i386 => target/i386}/shift_helper_template.h (100%)
 rename qemu/{target-i386 => target/i386}/smm_helper.c (100%)
 rename qemu/{target-i386 => target/i386}/svm.h (100%)
 rename qemu/{target-i386 => target/i386}/svm_helper.c (100%)
 rename qemu/{target-i386 => target/i386}/topology.h (100%)
 rename qemu/{target-i386 => target/i386}/translate.c (100%)
 rename qemu/{target-i386 => target/i386}/unicorn.c (100%)
 rename qemu/{target-i386 => target/i386}/unicorn.h (100%)
 rename qemu/{target-m68k => target/m68k}/Makefile.objs (100%)
 rename qemu/{target-m68k => target/m68k}/cpu-qom.h (100%)
 rename qemu/{target-m68k => target/m68k}/cpu.c (100%)
 rename qemu/{target-m68k => target/m68k}/cpu.h (100%)
 rename qemu/{target-m68k => target/m68k}/helper.c (100%)
 rename qemu/{target-m68k => target/m68k}/helper.h (100%)
 rename qemu/{target-m68k => target/m68k}/op_helper.c (100%)
 rename qemu/{target-m68k => target/m68k}/qregs.def (100%)
 rename qemu/{target-m68k => target/m68k}/translate.c (100%)
 rename qemu/{target-m68k => target/m68k}/unicorn.c (100%)
 rename qemu/{target-m68k => target/m68k}/unicorn.h (100%)
 rename qemu/{target-mips => target/mips}/Makefile.objs (100%)
 rename qemu/{target-mips => target/mips}/TODO (100%)
 rename qemu/{target-mips => target/mips}/cpu-qom.h (100%)
 rename qemu/{target-mips => target/mips}/cpu.c (100%)
 rename qemu/{target-mips => target/mips}/cpu.h (100%)
 rename qemu/{target-mips => target/mips}/dsp_helper.c (100%)
 rename qemu/{target-mips => target/mips}/helper.c (100%)
 rename qemu/{target-mips => target/mips}/helper.h (100%)
 rename qemu/{target-mips => target/mips}/lmi_helper.c (100%)
 rename qemu/{target-mips => target/mips}/mips-defs.h (100%)
 rename qemu/{target-mips => target/mips}/msa_helper.c (100%)
 rename qemu/{target-mips => target/mips}/op_helper.c (100%)
 rename qemu/{target-mips => target/mips}/translate.c (100%)
 rename qemu/{target-mips => target/mips}/translate_init.c (100%)
 rename qemu/{target-mips => target/mips}/unicorn.c (100%)
 rename qemu/{target-mips => target/mips}/unicorn.h (100%)
 rename qemu/{target-sparc => target/sparc}/Makefile.objs (100%)
 rename qemu/{target-sparc => target/sparc}/TODO (100%)
 rename qemu/{target-sparc => target/sparc}/asi.h (100%)
 rename qemu/{target-sparc => target/sparc}/cc_helper.c (100%)
 rename qemu/{target-sparc => target/sparc}/cpu-qom.h (100%)
 rename qemu/{target-sparc => target/sparc}/cpu.c (100%)
 rename qemu/{target-sparc => target/sparc}/cpu.h (100%)
 rename qemu/{target-sparc => target/sparc}/fop_helper.c (100%)
 rename qemu/{target-sparc => target/sparc}/helper.c (100%)
 rename qemu/{target-sparc => target/sparc}/helper.h (100%)
 rename qemu/{target-sparc => target/sparc}/int32_helper.c (100%)
 rename qemu/{target-sparc => target/sparc}/int64_helper.c (100%)
 rename qemu/{target-sparc => target/sparc}/ldst_helper.c (100%)
 rename qemu/{target-sparc => target/sparc}/mmu_helper.c (100%)
 rename qemu/{target-sparc => target/sparc}/translate.c (100%)
 rename qemu/{target-sparc => target/sparc}/unicorn.c (100%)
 rename qemu/{target-sparc => target/sparc}/unicorn.h (100%)
 rename qemu/{target-sparc => target/sparc}/unicorn64.c (100%)
 rename qemu/{target-sparc => target/sparc}/vis_helper.c (100%)
 rename qemu/{target-sparc => target/sparc}/win_helper.c (100%)

diff --git a/msvc/unicorn/aarch64-softmmu/aarch64-softmmu.vcxproj b/msvc/unicorn/aarch64-softmmu/aarch64-softmmu.vcxproj
index 8cb34b90..724b1586 100644
--- a/msvc/unicorn/aarch64-softmmu/aarch64-softmmu.vcxproj
+++ b/msvc/unicorn/aarch64-softmmu/aarch64-softmmu.vcxproj
@@ -21,16 +21,16 @@
   <ItemGroup>
     <ClInclude Include="..\..\..\qemu\fpu\softfloat-macros.h" />
     <ClInclude Include="..\..\..\qemu\fpu\softfloat-specialize.h" />
-    <ClInclude Include="..\..\..\qemu\target-arm\arm_ldst.h" />
-    <ClInclude Include="..\..\..\qemu\target-arm\cpu-qom.h" />
-    <ClInclude Include="..\..\..\qemu\target-arm\cpu.h" />
-    <ClInclude Include="..\..\..\qemu\target-arm\helper-a64.h" />
-    <ClInclude Include="..\..\..\qemu\target-arm\helper.h" />
-    <ClInclude Include="..\..\..\qemu\target-arm\internals.h" />
-    <ClInclude Include="..\..\..\qemu\target-arm\kvm-consts.h" />
-    <ClInclude Include="..\..\..\qemu\target-arm\op_addsub.h" />
-    <ClInclude Include="..\..\..\qemu\target-arm\translate.h" />
-    <ClInclude Include="..\..\..\qemu\target-arm\unicorn.h" />
+    <ClInclude Include="..\..\..\qemu\target\arm\arm_ldst.h" />
+    <ClInclude Include="..\..\..\qemu\target\arm\cpu-qom.h" />
+    <ClInclude Include="..\..\..\qemu\target\arm\cpu.h" />
+    <ClInclude Include="..\..\..\qemu\target\arm\helper-a64.h" />
+    <ClInclude Include="..\..\..\qemu\target\arm\helper.h" />
+    <ClInclude Include="..\..\..\qemu\target\arm\internals.h" />
+    <ClInclude Include="..\..\..\qemu\target\arm\kvm-consts.h" />
+    <ClInclude Include="..\..\..\qemu\target\arm\op_addsub.h" />
+    <ClInclude Include="..\..\..\qemu\target\arm\translate.h" />
+    <ClInclude Include="..\..\..\qemu\target\arm\unicorn.h" />
     <ClInclude Include="..\..\..\qemu\tcg\i386\tcg-target.h" />
     <ClInclude Include="..\..\..\qemu\tcg\tcg-be-ldst.h" />
     <ClInclude Include="..\..\..\qemu\tcg\tcg-be-null.h" />
@@ -54,18 +54,18 @@
     <ClCompile Include="..\..\..\qemu\ioport.c" />
     <ClCompile Include="..\..\..\qemu\memory.c" />
     <ClCompile Include="..\..\..\qemu\memory_mapping.c" />
-    <ClCompile Include="..\..\..\qemu\target-arm\cpu.c" />
-    <ClCompile Include="..\..\..\qemu\target-arm\cpu64.c" />
-    <ClCompile Include="..\..\..\qemu\target-arm\crypto_helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-arm\helper-a64.c" />
-    <ClCompile Include="..\..\..\qemu\target-arm\helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-arm\iwmmxt_helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-arm\neon_helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-arm\op_helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-arm\psci.c" />
-    <ClCompile Include="..\..\..\qemu\target-arm\translate-a64.c" />
-    <ClCompile Include="..\..\..\qemu\target-arm\translate.c" />
-    <ClCompile Include="..\..\..\qemu\target-arm\unicorn_aarch64.c" />
+    <ClCompile Include="..\..\..\qemu\target\arm\cpu.c" />
+    <ClCompile Include="..\..\..\qemu\target\arm\cpu64.c" />
+    <ClCompile Include="..\..\..\qemu\target\arm\crypto_helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\arm\helper-a64.c" />
+    <ClCompile Include="..\..\..\qemu\target\arm\helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\arm\iwmmxt_helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\arm\neon_helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\arm\op_helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\arm\psci.c" />
+    <ClCompile Include="..\..\..\qemu\target\arm\translate-a64.c" />
+    <ClCompile Include="..\..\..\qemu\target\arm\translate.c" />
+    <ClCompile Include="..\..\..\qemu\target\arm\unicorn_aarch64.c" />
     <ClCompile Include="..\..\..\qemu\tcg\i386\tcg-target.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -147,7 +147,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;__i386__;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;inline=__inline;__func__=__FUNCTION__;NEED_CPU_H;WIN32_LEAN_AND_MEAN</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target-arm;../../../include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target/arm;../../../include</AdditionalIncludeDirectories>
       <AdditionalOptions>/wd4018 /wd4244 /wd4267 %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <ExceptionHandling>false</ExceptionHandling>
@@ -168,7 +168,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;__x86_64__;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;inline=__inline;__func__=__FUNCTION__;NEED_CPU_H;WIN32_LEAN_AND_MEAN</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target-arm;../../../include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target/arm;../../../include</AdditionalIncludeDirectories>
       <AdditionalOptions>/wd4018 /wd4244 /wd4267 %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <ExceptionHandling>false</ExceptionHandling>
@@ -191,7 +191,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;__i386__;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;inline=__inline;__func__=__FUNCTION__;NEED_CPU_H;WIN32_LEAN_AND_MEAN</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target-arm;../../../include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target/arm;../../../include</AdditionalIncludeDirectories>
       <AdditionalOptions>/wd4018 /wd4244 /wd4267 %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <ExceptionHandling>false</ExceptionHandling>
@@ -217,7 +217,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;__x86_64__;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;inline=__inline;__func__=__FUNCTION__;NEED_CPU_H;WIN32_LEAN_AND_MEAN</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target-arm;../../../include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target/arm;../../../include</AdditionalIncludeDirectories>
       <AdditionalOptions>/wd4018 /wd4244 /wd4267 %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <ExceptionHandling>false</ExceptionHandling>
diff --git a/msvc/unicorn/aarch64-softmmu/aarch64-softmmu.vcxproj.filters b/msvc/unicorn/aarch64-softmmu/aarch64-softmmu.vcxproj.filters
index 7e71d4eb..a3fd3d0a 100644
--- a/msvc/unicorn/aarch64-softmmu/aarch64-softmmu.vcxproj.filters
+++ b/msvc/unicorn/aarch64-softmmu/aarch64-softmmu.vcxproj.filters
@@ -10,7 +10,7 @@
     <Filter Include="hw\arm">
       <UniqueIdentifier>{c74d3c4d-1f19-42c6-bf25-26820a53ac11}</UniqueIdentifier>
     </Filter>
-    <Filter Include="target-arm">
+    <Filter Include="target\arm">
       <UniqueIdentifier>{0e231806-86e4-4e05-8ef8-3e3d36860b00}</UniqueIdentifier>
     </Filter>
     <Filter Include="tcg">
@@ -27,35 +27,35 @@
     <ClInclude Include="..\..\..\qemu\fpu\softfloat-specialize.h">
       <Filter>fpu</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\target-arm\arm_ldst.h">
-      <Filter>target-arm</Filter>
+    <ClInclude Include="..\..\..\qemu\target\arm\arm_ldst.h">
+      <Filter>target\arm</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\target-arm\cpu-qom.h">
-      <Filter>target-arm</Filter>
+    <ClInclude Include="..\..\..\qemu\target\arm\cpu-qom.h">
+      <Filter>target\arm</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\target-arm\cpu.h">
-      <Filter>target-arm</Filter>
+    <ClInclude Include="..\..\..\qemu\target\arm\cpu.h">
+      <Filter>target\arm</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\target-arm\helper-a64.h">
-      <Filter>target-arm</Filter>
+    <ClInclude Include="..\..\..\qemu\target\arm\helper-a64.h">
+      <Filter>target\arm</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\target-arm\helper.h">
-      <Filter>target-arm</Filter>
+    <ClInclude Include="..\..\..\qemu\target\arm\helper.h">
+      <Filter>target\arm</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\target-arm\internals.h">
-      <Filter>target-arm</Filter>
+    <ClInclude Include="..\..\..\qemu\target\arm\internals.h">
+      <Filter>target\arm</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\target-arm\kvm-consts.h">
-      <Filter>target-arm</Filter>
+    <ClInclude Include="..\..\..\qemu\target\arm\kvm-consts.h">
+      <Filter>target\arm</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\target-arm\op_addsub.h">
-      <Filter>target-arm</Filter>
+    <ClInclude Include="..\..\..\qemu\target\arm\op_addsub.h">
+      <Filter>target\arm</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\target-arm\translate.h">
-      <Filter>target-arm</Filter>
+    <ClInclude Include="..\..\..\qemu\target\arm\translate.h">
+      <Filter>target\arm</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\target-arm\unicorn.h">
-      <Filter>target-arm</Filter>
+    <ClInclude Include="..\..\..\qemu\target\arm\unicorn.h">
+      <Filter>target\arm</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\qemu\tcg\tcg-be-ldst.h">
       <Filter>tcg</Filter>
@@ -92,41 +92,41 @@
     <ClCompile Include="..\..\..\qemu\hw\arm\virt.c">
       <Filter>hw\arm</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-arm\cpu.c">
-      <Filter>target-arm</Filter>
+    <ClCompile Include="..\..\..\qemu\target\arm\cpu.c">
+      <Filter>target\arm</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-arm\cpu64.c">
-      <Filter>target-arm</Filter>
+    <ClCompile Include="..\..\..\qemu\target\arm\cpu64.c">
+      <Filter>target\arm</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-arm\crypto_helper.c">
-      <Filter>target-arm</Filter>
+    <ClCompile Include="..\..\..\qemu\target\arm\crypto_helper.c">
+      <Filter>target\arm</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-arm\helper-a64.c">
-      <Filter>target-arm</Filter>
+    <ClCompile Include="..\..\..\qemu\target\arm\helper-a64.c">
+      <Filter>target\arm</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-arm\helper.c">
-      <Filter>target-arm</Filter>
+    <ClCompile Include="..\..\..\qemu\target\arm\helper.c">
+      <Filter>target\arm</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-arm\iwmmxt_helper.c">
-      <Filter>target-arm</Filter>
+    <ClCompile Include="..\..\..\qemu\target\arm\iwmmxt_helper.c">
+      <Filter>target\arm</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-arm\neon_helper.c">
-      <Filter>target-arm</Filter>
+    <ClCompile Include="..\..\..\qemu\target\arm\neon_helper.c">
+      <Filter>target\arm</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-arm\op_helper.c">
-      <Filter>target-arm</Filter>
+    <ClCompile Include="..\..\..\qemu\target\arm\op_helper.c">
+      <Filter>target\arm</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-arm\psci.c">
-      <Filter>target-arm</Filter>
+    <ClCompile Include="..\..\..\qemu\target\arm\psci.c">
+      <Filter>target\arm</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-arm\translate-a64.c">
-      <Filter>target-arm</Filter>
+    <ClCompile Include="..\..\..\qemu\target\arm\translate-a64.c">
+      <Filter>target\arm</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-arm\translate.c">
-      <Filter>target-arm</Filter>
+    <ClCompile Include="..\..\..\qemu\target\arm\translate.c">
+      <Filter>target\arm</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-arm\unicorn_aarch64.c">
-      <Filter>target-arm</Filter>
+    <ClCompile Include="..\..\..\qemu\target\arm\unicorn_aarch64.c">
+      <Filter>target\arm</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\qemu\tcg\optimize.c">
       <Filter>tcg</Filter>
diff --git a/msvc/unicorn/aarch64eb-softmmu/aarch64eb-softmmu.vcxproj b/msvc/unicorn/aarch64eb-softmmu/aarch64eb-softmmu.vcxproj
index 62ac4a5d..b262ed4b 100644
--- a/msvc/unicorn/aarch64eb-softmmu/aarch64eb-softmmu.vcxproj
+++ b/msvc/unicorn/aarch64eb-softmmu/aarch64eb-softmmu.vcxproj
@@ -21,16 +21,16 @@
   <ItemGroup>
     <ClInclude Include="..\..\..\qemu\fpu\softfloat-macros.h" />
     <ClInclude Include="..\..\..\qemu\fpu\softfloat-specialize.h" />
-    <ClInclude Include="..\..\..\qemu\target-arm\arm_ldst.h" />
-    <ClInclude Include="..\..\..\qemu\target-arm\cpu-qom.h" />
-    <ClInclude Include="..\..\..\qemu\target-arm\cpu.h" />
-    <ClInclude Include="..\..\..\qemu\target-arm\helper-a64.h" />
-    <ClInclude Include="..\..\..\qemu\target-arm\helper.h" />
-    <ClInclude Include="..\..\..\qemu\target-arm\internals.h" />
-    <ClInclude Include="..\..\..\qemu\target-arm\kvm-consts.h" />
-    <ClInclude Include="..\..\..\qemu\target-arm\op_addsub.h" />
-    <ClInclude Include="..\..\..\qemu\target-arm\translate.h" />
-    <ClInclude Include="..\..\..\qemu\target-arm\unicorn.h" />
+    <ClInclude Include="..\..\..\qemu\target\arm\arm_ldst.h" />
+    <ClInclude Include="..\..\..\qemu\target\arm\cpu-qom.h" />
+    <ClInclude Include="..\..\..\qemu\target\arm\cpu.h" />
+    <ClInclude Include="..\..\..\qemu\target\arm\helper-a64.h" />
+    <ClInclude Include="..\..\..\qemu\target\arm\helper.h" />
+    <ClInclude Include="..\..\..\qemu\target\arm\internals.h" />
+    <ClInclude Include="..\..\..\qemu\target\arm\kvm-consts.h" />
+    <ClInclude Include="..\..\..\qemu\target\arm\op_addsub.h" />
+    <ClInclude Include="..\..\..\qemu\target\arm\translate.h" />
+    <ClInclude Include="..\..\..\qemu\target\arm\unicorn.h" />
     <ClInclude Include="..\..\..\qemu\tcg\i386\tcg-target.h" />
     <ClInclude Include="..\..\..\qemu\tcg\tcg-be-ldst.h" />
     <ClInclude Include="..\..\..\qemu\tcg\tcg-be-null.h" />
@@ -54,18 +54,18 @@
     <ClCompile Include="..\..\..\qemu\ioport.c" />
     <ClCompile Include="..\..\..\qemu\memory.c" />
     <ClCompile Include="..\..\..\qemu\memory_mapping.c" />
-    <ClCompile Include="..\..\..\qemu\target-arm\cpu.c" />
-    <ClCompile Include="..\..\..\qemu\target-arm\cpu64.c" />
-    <ClCompile Include="..\..\..\qemu\target-arm\crypto_helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-arm\helper-a64.c" />
-    <ClCompile Include="..\..\..\qemu\target-arm\helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-arm\iwmmxt_helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-arm\neon_helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-arm\op_helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-arm\psci.c" />
-    <ClCompile Include="..\..\..\qemu\target-arm\translate-a64.c" />
-    <ClCompile Include="..\..\..\qemu\target-arm\translate.c" />
-    <ClCompile Include="..\..\..\qemu\target-arm\unicorn_aarch64.c" />
+    <ClCompile Include="..\..\..\qemu\target\arm\cpu.c" />
+    <ClCompile Include="..\..\..\qemu\target\arm\cpu64.c" />
+    <ClCompile Include="..\..\..\qemu\target\arm\crypto_helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\arm\helper-a64.c" />
+    <ClCompile Include="..\..\..\qemu\target\arm\helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\arm\iwmmxt_helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\arm\neon_helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\arm\op_helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\arm\psci.c" />
+    <ClCompile Include="..\..\..\qemu\target\arm\translate-a64.c" />
+    <ClCompile Include="..\..\..\qemu\target\arm\translate.c" />
+    <ClCompile Include="..\..\..\qemu\target\arm\unicorn_aarch64.c" />
     <ClCompile Include="..\..\..\qemu\tcg\i386\tcg-target.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -147,7 +147,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;__i386__;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;inline=__inline;__func__=__FUNCTION__;NEED_CPU_H;WIN32_LEAN_AND_MEAN</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target-arm;../../../include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target/arm;../../../include</AdditionalIncludeDirectories>
       <AdditionalOptions>/wd4018 /wd4244 /wd4267 %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <ExceptionHandling>false</ExceptionHandling>
@@ -168,7 +168,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;__x86_64__;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;inline=__inline;__func__=__FUNCTION__;NEED_CPU_H;WIN32_LEAN_AND_MEAN</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target-arm;../../../include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target/arm;../../../include</AdditionalIncludeDirectories>
       <AdditionalOptions>/wd4018 /wd4244 /wd4267 %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <ExceptionHandling>false</ExceptionHandling>
@@ -191,7 +191,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;__i386__;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;inline=__inline;__func__=__FUNCTION__;NEED_CPU_H;WIN32_LEAN_AND_MEAN</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target-arm;../../../include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target/arm;../../../include</AdditionalIncludeDirectories>
       <AdditionalOptions>/wd4018 /wd4244 /wd4267 %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <ExceptionHandling>false</ExceptionHandling>
@@ -217,7 +217,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;__x86_64__;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;inline=__inline;__func__=__FUNCTION__;NEED_CPU_H;WIN32_LEAN_AND_MEAN</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target-arm;../../../include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target/arm;../../../include</AdditionalIncludeDirectories>
       <AdditionalOptions>/wd4018 /wd4244 /wd4267 %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <ExceptionHandling>false</ExceptionHandling>
diff --git a/msvc/unicorn/aarch64eb-softmmu/aarch64eb-softmmu.vcxproj.filters b/msvc/unicorn/aarch64eb-softmmu/aarch64eb-softmmu.vcxproj.filters
index 17ee1653..86d34f0d 100644
--- a/msvc/unicorn/aarch64eb-softmmu/aarch64eb-softmmu.vcxproj.filters
+++ b/msvc/unicorn/aarch64eb-softmmu/aarch64eb-softmmu.vcxproj.filters
@@ -10,7 +10,7 @@
     <Filter Include="hw\arm">
       <UniqueIdentifier>{fac9d0b8-8064-4486-bc54-0a63831fae99}</UniqueIdentifier>
     </Filter>
-    <Filter Include="target-arm">
+    <Filter Include="target\arm">
       <UniqueIdentifier>{8bb5cb48-4c00-419c-9ec9-7fa2829dd28e}</UniqueIdentifier>
     </Filter>
     <Filter Include="tcg">
@@ -27,35 +27,35 @@
     <ClInclude Include="..\..\..\qemu\fpu\softfloat-specialize.h">
       <Filter>fpu</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\target-arm\arm_ldst.h">
-      <Filter>target-arm</Filter>
+    <ClInclude Include="..\..\..\qemu\target\arm\arm_ldst.h">
+      <Filter>target\arm</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\target-arm\cpu-qom.h">
-      <Filter>target-arm</Filter>
+    <ClInclude Include="..\..\..\qemu\target\arm\cpu-qom.h">
+      <Filter>target\arm</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\target-arm\cpu.h">
-      <Filter>target-arm</Filter>
+    <ClInclude Include="..\..\..\qemu\target\arm\cpu.h">
+      <Filter>target\arm</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\target-arm\helper-a64.h">
-      <Filter>target-arm</Filter>
+    <ClInclude Include="..\..\..\qemu\target\arm\helper-a64.h">
+      <Filter>target\arm</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\target-arm\helper.h">
-      <Filter>target-arm</Filter>
+    <ClInclude Include="..\..\..\qemu\target\arm\helper.h">
+      <Filter>target\arm</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\target-arm\internals.h">
-      <Filter>target-arm</Filter>
+    <ClInclude Include="..\..\..\qemu\target\arm\internals.h">
+      <Filter>target\arm</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\target-arm\kvm-consts.h">
-      <Filter>target-arm</Filter>
+    <ClInclude Include="..\..\..\qemu\target\arm\kvm-consts.h">
+      <Filter>target\arm</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\target-arm\op_addsub.h">
-      <Filter>target-arm</Filter>
+    <ClInclude Include="..\..\..\qemu\target\arm\op_addsub.h">
+      <Filter>target\arm</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\target-arm\translate.h">
-      <Filter>target-arm</Filter>
+    <ClInclude Include="..\..\..\qemu\target\arm\translate.h">
+      <Filter>target\arm</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\target-arm\unicorn.h">
-      <Filter>target-arm</Filter>
+    <ClInclude Include="..\..\..\qemu\target\arm\unicorn.h">
+      <Filter>target\arm</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\qemu\tcg\tcg-be-ldst.h">
       <Filter>tcg</Filter>
@@ -92,41 +92,41 @@
     <ClCompile Include="..\..\..\qemu\hw\arm\virt.c">
       <Filter>hw\arm</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-arm\cpu.c">
-      <Filter>target-arm</Filter>
+    <ClCompile Include="..\..\..\qemu\target\arm\cpu.c">
+      <Filter>target\arm</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-arm\cpu64.c">
-      <Filter>target-arm</Filter>
+    <ClCompile Include="..\..\..\qemu\target\arm\cpu64.c">
+      <Filter>target\arm</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-arm\crypto_helper.c">
-      <Filter>target-arm</Filter>
+    <ClCompile Include="..\..\..\qemu\target\arm\crypto_helper.c">
+      <Filter>target\arm</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-arm\helper-a64.c">
-      <Filter>target-arm</Filter>
+    <ClCompile Include="..\..\..\qemu\target\arm\helper-a64.c">
+      <Filter>target\arm</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-arm\helper.c">
-      <Filter>target-arm</Filter>
+    <ClCompile Include="..\..\..\qemu\target\arm\helper.c">
+      <Filter>target\arm</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-arm\iwmmxt_helper.c">
-      <Filter>target-arm</Filter>
+    <ClCompile Include="..\..\..\qemu\target\arm\iwmmxt_helper.c">
+      <Filter>target\arm</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-arm\neon_helper.c">
-      <Filter>target-arm</Filter>
+    <ClCompile Include="..\..\..\qemu\target\arm\neon_helper.c">
+      <Filter>target\arm</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-arm\op_helper.c">
-      <Filter>target-arm</Filter>
+    <ClCompile Include="..\..\..\qemu\target\arm\op_helper.c">
+      <Filter>target\arm</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-arm\psci.c">
-      <Filter>target-arm</Filter>
+    <ClCompile Include="..\..\..\qemu\target\arm\psci.c">
+      <Filter>target\arm</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-arm\translate-a64.c">
-      <Filter>target-arm</Filter>
+    <ClCompile Include="..\..\..\qemu\target\arm\translate-a64.c">
+      <Filter>target\arm</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-arm\translate.c">
-      <Filter>target-arm</Filter>
+    <ClCompile Include="..\..\..\qemu\target\arm\translate.c">
+      <Filter>target\arm</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-arm\unicorn_aarch64.c">
-      <Filter>target-arm</Filter>
+    <ClCompile Include="..\..\..\qemu\target\arm\unicorn_aarch64.c">
+      <Filter>target\arm</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\qemu\tcg\optimize.c">
       <Filter>tcg</Filter>
diff --git a/msvc/unicorn/arm-softmmu/arm-softmmu.vcxproj b/msvc/unicorn/arm-softmmu/arm-softmmu.vcxproj
index 29d289db..674b81ac 100644
--- a/msvc/unicorn/arm-softmmu/arm-softmmu.vcxproj
+++ b/msvc/unicorn/arm-softmmu/arm-softmmu.vcxproj
@@ -21,15 +21,15 @@
   <ItemGroup>
     <ClInclude Include="..\..\..\qemu\fpu\softfloat-macros.h" />
     <ClInclude Include="..\..\..\qemu\fpu\softfloat-specialize.h" />
-    <ClInclude Include="..\..\..\qemu\target-arm\arm_ldst.h" />
-    <ClInclude Include="..\..\..\qemu\target-arm\cpu-qom.h" />
-    <ClInclude Include="..\..\..\qemu\target-arm\cpu.h" />
-    <ClInclude Include="..\..\..\qemu\target-arm\helper.h" />
-    <ClInclude Include="..\..\..\qemu\target-arm\internals.h" />
-    <ClInclude Include="..\..\..\qemu\target-arm\kvm-consts.h" />
-    <ClInclude Include="..\..\..\qemu\target-arm\op_addsub.h" />
-    <ClInclude Include="..\..\..\qemu\target-arm\translate.h" />
-    <ClInclude Include="..\..\..\qemu\target-arm\unicorn.h" />
+    <ClInclude Include="..\..\..\qemu\target\arm\arm_ldst.h" />
+    <ClInclude Include="..\..\..\qemu\target\arm\cpu-qom.h" />
+    <ClInclude Include="..\..\..\qemu\target\arm\cpu.h" />
+    <ClInclude Include="..\..\..\qemu\target\arm\helper.h" />
+    <ClInclude Include="..\..\..\qemu\target\arm\internals.h" />
+    <ClInclude Include="..\..\..\qemu\target\arm\kvm-consts.h" />
+    <ClInclude Include="..\..\..\qemu\target\arm\op_addsub.h" />
+    <ClInclude Include="..\..\..\qemu\target\arm\translate.h" />
+    <ClInclude Include="..\..\..\qemu\target\arm\unicorn.h" />
     <ClInclude Include="..\..\..\qemu\tcg\i386\tcg-target.h" />
     <ClInclude Include="..\..\..\qemu\tcg\tcg-be-ldst.h" />
     <ClInclude Include="..\..\..\qemu\tcg\tcg-be-null.h" />
@@ -53,15 +53,15 @@
     <ClCompile Include="..\..\..\qemu\ioport.c" />
     <ClCompile Include="..\..\..\qemu\memory.c" />
     <ClCompile Include="..\..\..\qemu\memory_mapping.c" />
-    <ClCompile Include="..\..\..\qemu\target-arm\cpu.c" />
-    <ClCompile Include="..\..\..\qemu\target-arm\crypto_helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-arm\helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-arm\iwmmxt_helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-arm\neon_helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-arm\op_helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-arm\psci.c" />
-    <ClCompile Include="..\..\..\qemu\target-arm\translate.c" />
-    <ClCompile Include="..\..\..\qemu\target-arm\unicorn_arm.c" />
+    <ClCompile Include="..\..\..\qemu\target\arm\cpu.c" />
+    <ClCompile Include="..\..\..\qemu\target\arm\crypto_helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\arm\helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\arm\iwmmxt_helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\arm\neon_helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\arm\op_helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\arm\psci.c" />
+    <ClCompile Include="..\..\..\qemu\target\arm\translate.c" />
+    <ClCompile Include="..\..\..\qemu\target\arm\unicorn_arm.c" />
     <ClCompile Include="..\..\..\qemu\tcg\i386\tcg-target.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -143,7 +143,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;__i386__;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;inline=__inline;__func__=__FUNCTION__;NEED_CPU_H;WIN32_LEAN_AND_MEAN</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target-arm;../../../include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target/arm;../../../include</AdditionalIncludeDirectories>
       <AdditionalOptions>/wd4018 /wd4244 /wd4267 %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <ExceptionHandling>false</ExceptionHandling>
@@ -164,7 +164,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;__x86_64__;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;inline=__inline;__func__=__FUNCTION__;NEED_CPU_H;WIN32_LEAN_AND_MEAN</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target-arm;../../../include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target/arm;../../../include</AdditionalIncludeDirectories>
       <AdditionalOptions>/wd4018 /wd4244 /wd4267 %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <ExceptionHandling>false</ExceptionHandling>
@@ -187,7 +187,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;__i386__;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;inline=__inline;__func__=__FUNCTION__;NEED_CPU_H;WIN32_LEAN_AND_MEAN</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target-arm;../../../include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target/arm;../../../include</AdditionalIncludeDirectories>
       <AdditionalOptions>/wd4018 /wd4244 /wd4267 %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <ExceptionHandling>false</ExceptionHandling>
@@ -213,7 +213,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;__x86_64__;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;inline=__inline;__func__=__FUNCTION__;NEED_CPU_H;WIN32_LEAN_AND_MEAN</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target-arm;../../../include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target/arm;../../../include</AdditionalIncludeDirectories>
       <AdditionalOptions>/wd4018 /wd4244 /wd4267 %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <ExceptionHandling>false</ExceptionHandling>
diff --git a/msvc/unicorn/armeb-softmmu/armeb-softmmu.vcxproj b/msvc/unicorn/armeb-softmmu/armeb-softmmu.vcxproj
index a7856cec..e19bf812 100644
--- a/msvc/unicorn/armeb-softmmu/armeb-softmmu.vcxproj
+++ b/msvc/unicorn/armeb-softmmu/armeb-softmmu.vcxproj
@@ -21,15 +21,15 @@
   <ItemGroup>
     <ClInclude Include="..\..\..\qemu\fpu\softfloat-macros.h" />
     <ClInclude Include="..\..\..\qemu\fpu\softfloat-specialize.h" />
-    <ClInclude Include="..\..\..\qemu\target-arm\arm_ldst.h" />
-    <ClInclude Include="..\..\..\qemu\target-arm\cpu-qom.h" />
-    <ClInclude Include="..\..\..\qemu\target-arm\cpu.h" />
-    <ClInclude Include="..\..\..\qemu\target-arm\helper.h" />
-    <ClInclude Include="..\..\..\qemu\target-arm\internals.h" />
-    <ClInclude Include="..\..\..\qemu\target-arm\kvm-consts.h" />
-    <ClInclude Include="..\..\..\qemu\target-arm\op_addsub.h" />
-    <ClInclude Include="..\..\..\qemu\target-arm\translate.h" />
-    <ClInclude Include="..\..\..\qemu\target-arm\unicorn.h" />
+    <ClInclude Include="..\..\..\qemu\target\arm\arm_ldst.h" />
+    <ClInclude Include="..\..\..\qemu\target\arm\cpu-qom.h" />
+    <ClInclude Include="..\..\..\qemu\target\arm\cpu.h" />
+    <ClInclude Include="..\..\..\qemu\target\arm\helper.h" />
+    <ClInclude Include="..\..\..\qemu\target\arm\internals.h" />
+    <ClInclude Include="..\..\..\qemu\target\arm\kvm-consts.h" />
+    <ClInclude Include="..\..\..\qemu\target\arm\op_addsub.h" />
+    <ClInclude Include="..\..\..\qemu\target\arm\translate.h" />
+    <ClInclude Include="..\..\..\qemu\target\arm\unicorn.h" />
     <ClInclude Include="..\..\..\qemu\tcg\i386\tcg-target.h" />
     <ClInclude Include="..\..\..\qemu\tcg\tcg-be-ldst.h" />
     <ClInclude Include="..\..\..\qemu\tcg\tcg-be-null.h" />
@@ -53,15 +53,15 @@
     <ClCompile Include="..\..\..\qemu\ioport.c" />
     <ClCompile Include="..\..\..\qemu\memory.c" />
     <ClCompile Include="..\..\..\qemu\memory_mapping.c" />
-    <ClCompile Include="..\..\..\qemu\target-arm\cpu.c" />
-    <ClCompile Include="..\..\..\qemu\target-arm\crypto_helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-arm\helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-arm\iwmmxt_helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-arm\neon_helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-arm\op_helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-arm\psci.c" />
-    <ClCompile Include="..\..\..\qemu\target-arm\translate.c" />
-    <ClCompile Include="..\..\..\qemu\target-arm\unicorn_arm.c" />
+    <ClCompile Include="..\..\..\qemu\target\arm\cpu.c" />
+    <ClCompile Include="..\..\..\qemu\target\arm\crypto_helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\arm\helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\arm\iwmmxt_helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\arm\neon_helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\arm\op_helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\arm\psci.c" />
+    <ClCompile Include="..\..\..\qemu\target\arm\translate.c" />
+    <ClCompile Include="..\..\..\qemu\target\arm\unicorn_arm.c" />
     <ClCompile Include="..\..\..\qemu\tcg\i386\tcg-target.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -143,7 +143,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;__i386__;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;inline=__inline;__func__=__FUNCTION__;NEED_CPU_H;WIN32_LEAN_AND_MEAN</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target-arm;../../../include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target/arm;../../../include</AdditionalIncludeDirectories>
       <AdditionalOptions>/wd4018 /wd4244 /wd4267 %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <ExceptionHandling>false</ExceptionHandling>
@@ -164,7 +164,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;__x86_64__;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;inline=__inline;__func__=__FUNCTION__;NEED_CPU_H;WIN32_LEAN_AND_MEAN</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target-arm;../../../include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target/arm;../../../include</AdditionalIncludeDirectories>
       <AdditionalOptions>/wd4018 /wd4244 /wd4267 %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <ExceptionHandling>false</ExceptionHandling>
@@ -187,7 +187,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;__i386__;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;inline=__inline;__func__=__FUNCTION__;NEED_CPU_H;WIN32_LEAN_AND_MEAN</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target-arm;../../../include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target/arm;../../../include</AdditionalIncludeDirectories>
       <AdditionalOptions>/wd4018 /wd4244 /wd4267 %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <ExceptionHandling>false</ExceptionHandling>
@@ -213,7 +213,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;__x86_64__;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;inline=__inline;__func__=__FUNCTION__;NEED_CPU_H;WIN32_LEAN_AND_MEAN</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target-arm;../../../include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target/arm;../../../include</AdditionalIncludeDirectories>
       <AdditionalOptions>/wd4018 /wd4244 /wd4267 %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <ExceptionHandling>false</ExceptionHandling>
diff --git a/msvc/unicorn/m68k-softmmu/m68k-softmmu.vcxproj b/msvc/unicorn/m68k-softmmu/m68k-softmmu.vcxproj
index d277ed47..53e8123c 100644
--- a/msvc/unicorn/m68k-softmmu/m68k-softmmu.vcxproj
+++ b/msvc/unicorn/m68k-softmmu/m68k-softmmu.vcxproj
@@ -28,11 +28,11 @@
     <ClInclude Include="..\..\..\qemu\tcg\tcg-opc.h" />
     <ClInclude Include="..\..\..\qemu\tcg\tcg-runtime.h" />
     <ClInclude Include="..\..\..\qemu\tcg\tcg.h" />
-    <ClInclude Include="..\..\..\qemu\target-m68k\cpu-qom.h" />
-    <ClInclude Include="..\..\..\qemu\target-m68k\cpu.h" />
-    <ClInclude Include="..\..\..\qemu\target-m68k\helper.h" />
-    <ClInclude Include="..\..\..\qemu\target-m68k\m68k-qreg.h" />
-    <ClInclude Include="..\..\..\qemu\target-m68k\unicorn.h" />
+    <ClInclude Include="..\..\..\qemu\target\m68k\cpu-qom.h" />
+    <ClInclude Include="..\..\..\qemu\target\m68k\cpu.h" />
+    <ClInclude Include="..\..\..\qemu\target\m68k\helper.h" />
+    <ClInclude Include="..\..\..\qemu\target\m68k\m68k-qreg.h" />
+    <ClInclude Include="..\..\..\qemu\target\m68k\unicorn.h" />
     <ClInclude Include="..\..\..\qemu\m68k.h" />
     <ClInclude Include="..\config-host.h" />
     <ClInclude Include="config-target.h" />
@@ -59,11 +59,11 @@
     <ClCompile Include="..\..\..\qemu\translate-all.c" />
     <ClCompile Include="..\..\..\qemu\translate-common.c" />
     <ClCompile Include="..\..\..\qemu\hw\m68k\dummy_m68k.c" />
-    <ClCompile Include="..\..\..\qemu\target-m68k\cpu.c" />
-    <ClCompile Include="..\..\..\qemu\target-m68k\helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-m68k\op_helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-m68k\translate.c" />
-    <ClCompile Include="..\..\..\qemu\target-m68k\unicorn.c" />
+    <ClCompile Include="..\..\..\qemu\target\m68k\cpu.c" />
+    <ClCompile Include="..\..\..\qemu\target\m68k\helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\m68k\op_helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\m68k\translate.c" />
+    <ClCompile Include="..\..\..\qemu\target\m68k\unicorn.c" />
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{2C5AD347-6E34-463B-8289-00578E43B255}</ProjectGuid>
@@ -134,7 +134,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;__i386__;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;inline=__inline;__func__=__FUNCTION__;NEED_CPU_H;WIN32_LEAN_AND_MEAN</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target-m68k;../../../include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target/m68k;../../../include</AdditionalIncludeDirectories>
       <AdditionalOptions>/wd4018 /wd4244 /wd4267 %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <ExceptionHandling>false</ExceptionHandling>
@@ -155,7 +155,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;__x86_64__;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;inline=__inline;__func__=__FUNCTION__;NEED_CPU_H;WIN32_LEAN_AND_MEAN</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target-m68k;../../../include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target/m68k;../../../include</AdditionalIncludeDirectories>
       <AdditionalOptions>/wd4018 /wd4244 /wd4267 %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <ExceptionHandling>false</ExceptionHandling>
@@ -178,7 +178,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;__i386__;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;inline=__inline;__func__=__FUNCTION__;NEED_CPU_H;WIN32_LEAN_AND_MEAN</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target-m68k;../../../include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target/m68k;../../../include</AdditionalIncludeDirectories>
       <AdditionalOptions>/wd4018 /wd4244 /wd4267 %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <ExceptionHandling>false</ExceptionHandling>
@@ -204,7 +204,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;__x86_64__;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;inline=__inline;__func__=__FUNCTION__;NEED_CPU_H;WIN32_LEAN_AND_MEAN</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target-m68k;../../../include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target/m68k;../../../include</AdditionalIncludeDirectories>
       <AdditionalOptions>/wd4018 /wd4244 /wd4267 %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <ExceptionHandling>false</ExceptionHandling>
diff --git a/msvc/unicorn/m68k-softmmu/m68k-softmmu.vcxproj.filters b/msvc/unicorn/m68k-softmmu/m68k-softmmu.vcxproj.filters
index b24df0e8..c0a30abd 100644
--- a/msvc/unicorn/m68k-softmmu/m68k-softmmu.vcxproj.filters
+++ b/msvc/unicorn/m68k-softmmu/m68k-softmmu.vcxproj.filters
@@ -10,7 +10,7 @@
     <Filter Include="hw\m68k">
       <UniqueIdentifier>{484590c4-abd5-4db4-8b06-b34087856c27}</UniqueIdentifier>
     </Filter>
-    <Filter Include="target-m68k">
+    <Filter Include="target\m68k">
       <UniqueIdentifier>{476366de-d432-4ce4-8e04-64aa34326aa0}</UniqueIdentifier>
     </Filter>
     <Filter Include="tcg">
@@ -48,20 +48,20 @@
     <ClInclude Include="..\..\..\qemu\tcg\i386\tcg-target.h">
       <Filter>tcg\i386</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\target-m68k\cpu.h">
-      <Filter>target-m68k</Filter>
+    <ClInclude Include="..\..\..\qemu\target\m68k\cpu.h">
+      <Filter>target\m68k</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\target-m68k\cpu-qom.h">
-      <Filter>target-m68k</Filter>
+    <ClInclude Include="..\..\..\qemu\target\m68k\cpu-qom.h">
+      <Filter>target\m68k</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\target-m68k\helper.h">
-      <Filter>target-m68k</Filter>
+    <ClInclude Include="..\..\..\qemu\target\m68k\helper.h">
+      <Filter>target\m68k</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\target-m68k\m68k-qreg.h">
-      <Filter>target-m68k</Filter>
+    <ClInclude Include="..\..\..\qemu\target\m68k\m68k-qreg.h">
+      <Filter>target\m68k</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\target-m68k\unicorn.h">
-      <Filter>target-m68k</Filter>
+    <ClInclude Include="..\..\..\qemu\target\m68k\unicorn.h">
+      <Filter>target\m68k</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\qemu\m68k.h" />
     <ClInclude Include="..\config-host.h" />
@@ -96,20 +96,20 @@
     <ClCompile Include="..\..\..\qemu\hw\m68k\dummy_m68k.c">
       <Filter>hw\m68k</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-m68k\cpu.c">
-      <Filter>target-m68k</Filter>
+    <ClCompile Include="..\..\..\qemu\target\m68k\cpu.c">
+      <Filter>target\m68k</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-m68k\helper.c">
-      <Filter>target-m68k</Filter>
+    <ClCompile Include="..\..\..\qemu\target\m68k\helper.c">
+      <Filter>target\m68k</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-m68k\op_helper.c">
-      <Filter>target-m68k</Filter>
+    <ClCompile Include="..\..\..\qemu\target\m68k\op_helper.c">
+      <Filter>target\m68k</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-m68k\translate.c">
-      <Filter>target-m68k</Filter>
+    <ClCompile Include="..\..\..\qemu\target\m68k\translate.c">
+      <Filter>target\m68k</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-m68k\unicorn.c">
-      <Filter>target-m68k</Filter>
+    <ClCompile Include="..\..\..\qemu\target\m68k\unicorn.c">
+      <Filter>target\m68k</Filter>
     </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/msvc/unicorn/mips-softmmu/mips-softmmu.vcxproj b/msvc/unicorn/mips-softmmu/mips-softmmu.vcxproj
index 44a3a4fa..c4977e23 100644
--- a/msvc/unicorn/mips-softmmu/mips-softmmu.vcxproj
+++ b/msvc/unicorn/mips-softmmu/mips-softmmu.vcxproj
@@ -21,11 +21,11 @@
   <ItemGroup>
     <ClInclude Include="..\..\..\qemu\fpu\softfloat-macros.h" />
     <ClInclude Include="..\..\..\qemu\fpu\softfloat-specialize.h" />
-    <ClInclude Include="..\..\..\qemu\target-mips\cpu-qom.h" />
-    <ClInclude Include="..\..\..\qemu\target-mips\cpu.h" />
-    <ClInclude Include="..\..\..\qemu\target-mips\helper.h" />
-    <ClInclude Include="..\..\..\qemu\target-mips\mips-defs.h" />
-    <ClInclude Include="..\..\..\qemu\target-mips\unicorn.h" />
+    <ClInclude Include="..\..\..\qemu\target\mips\cpu-qom.h" />
+    <ClInclude Include="..\..\..\qemu\target\mips\cpu.h" />
+    <ClInclude Include="..\..\..\qemu\target\mips\helper.h" />
+    <ClInclude Include="..\..\..\qemu\target\mips\mips-defs.h" />
+    <ClInclude Include="..\..\..\qemu\target\mips\unicorn.h" />
     <ClInclude Include="..\..\..\qemu\tcg\i386\tcg-target.h" />
     <ClInclude Include="..\..\..\qemu\tcg\tcg-be-ldst.h" />
     <ClInclude Include="..\..\..\qemu\tcg\tcg-be-null.h" />
@@ -50,20 +50,20 @@
     <ClCompile Include="..\..\..\qemu\ioport.c" />
     <ClCompile Include="..\..\..\qemu\memory.c" />
     <ClCompile Include="..\..\..\qemu\memory_mapping.c" />
-    <ClCompile Include="..\..\..\qemu\target-mips\cpu.c" />
-    <ClCompile Include="..\..\..\qemu\target-mips\dsp_helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-mips\helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-mips\lmi_helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-mips\msa_helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-mips\op_helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-mips\translate.c" />
-    <ClCompile Include="..\..\..\qemu\target-mips\translate_init.c">
+    <ClCompile Include="..\..\..\qemu\target\mips\cpu.c" />
+    <ClCompile Include="..\..\..\qemu\target\mips\dsp_helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\mips\helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\mips\lmi_helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\mips\msa_helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\mips\op_helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\mips\translate.c" />
+    <ClCompile Include="..\..\..\qemu\target\mips\translate_init.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-mips\unicorn.c" />
+    <ClCompile Include="..\..\..\qemu\target\mips\unicorn.c" />
     <ClCompile Include="..\..\..\qemu\tcg\i386\tcg-target.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -145,7 +145,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;__i386__;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;inline=__inline;__func__=__FUNCTION__;NEED_CPU_H;WIN32_LEAN_AND_MEAN</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target-mips;../../../include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target/mips;../../../include</AdditionalIncludeDirectories>
       <AdditionalOptions>/wd4018 /wd4244 /wd4267 %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <ExceptionHandling>false</ExceptionHandling>
@@ -166,7 +166,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;__x86_64__;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;inline=__inline;__func__=__FUNCTION__;NEED_CPU_H;WIN32_LEAN_AND_MEAN</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target-mips;../../../include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target/mips;../../../include</AdditionalIncludeDirectories>
       <AdditionalOptions>/wd4018 /wd4244 /wd4267 %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <ExceptionHandling>false</ExceptionHandling>
@@ -189,7 +189,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;__i386__;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;inline=__inline;__func__=__FUNCTION__;NEED_CPU_H;WIN32_LEAN_AND_MEAN</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target-mips;../../../include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target/mips;../../../include</AdditionalIncludeDirectories>
       <AdditionalOptions>/wd4018 /wd4244 /wd4267 %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <ExceptionHandling>false</ExceptionHandling>
@@ -215,7 +215,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;__x86_64__;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;inline=__inline;__func__=__FUNCTION__;NEED_CPU_H;WIN32_LEAN_AND_MEAN</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target-mips;../../../include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target/mips;../../../include</AdditionalIncludeDirectories>
       <AdditionalOptions>/wd4018 /wd4244 /wd4267 %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <ExceptionHandling>false</ExceptionHandling>
diff --git a/msvc/unicorn/mips-softmmu/mips-softmmu.vcxproj.filters b/msvc/unicorn/mips-softmmu/mips-softmmu.vcxproj.filters
index 002435bb..d06b29db 100644
--- a/msvc/unicorn/mips-softmmu/mips-softmmu.vcxproj.filters
+++ b/msvc/unicorn/mips-softmmu/mips-softmmu.vcxproj.filters
@@ -10,7 +10,7 @@
     <Filter Include="hw\mips">
       <UniqueIdentifier>{0784e023-e00c-4034-adc4-9b1ad07d2eb7}</UniqueIdentifier>
     </Filter>
-    <Filter Include="target-mips">
+    <Filter Include="target\mips">
       <UniqueIdentifier>{d60f24b3-d409-40d8-b7d2-f3e71960841a}</UniqueIdentifier>
     </Filter>
     <Filter Include="tcg">
@@ -48,20 +48,20 @@
     <ClInclude Include="..\..\..\qemu\tcg\i386\tcg-target.h">
       <Filter>tcg\i386</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\target-mips\cpu.h">
-      <Filter>target-mips</Filter>
+    <ClInclude Include="..\..\..\qemu\target\mips\cpu.h">
+      <Filter>target\mips</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\target-mips\cpu-qom.h">
-      <Filter>target-mips</Filter>
+    <ClInclude Include="..\..\..\qemu\target\mips\cpu-qom.h">
+      <Filter>target\mips</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\target-mips\helper.h">
-      <Filter>target-mips</Filter>
+    <ClInclude Include="..\..\..\qemu\target\mips\helper.h">
+      <Filter>target\mips</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\target-mips\mips-defs.h">
-      <Filter>target-mips</Filter>
+    <ClInclude Include="..\..\..\qemu\target\mips\mips-defs.h">
+      <Filter>target\mips</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\target-mips\unicorn.h">
-      <Filter>target-mips</Filter>
+    <ClInclude Include="..\..\..\qemu\target\mips\unicorn.h">
+      <Filter>target\mips</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\qemu\mips.h" />
     <ClInclude Include="..\config-host.h" />
@@ -102,32 +102,32 @@
     <ClCompile Include="..\..\..\qemu\hw\mips\cputimer.c">
       <Filter>hw\mips</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-mips\cpu.c">
-      <Filter>target-mips</Filter>
+    <ClCompile Include="..\..\..\qemu\target\mips\cpu.c">
+      <Filter>target\mips</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-mips\dsp_helper.c">
-      <Filter>target-mips</Filter>
+    <ClCompile Include="..\..\..\qemu\target\mips\dsp_helper.c">
+      <Filter>target\mips</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-mips\helper.c">
-      <Filter>target-mips</Filter>
+    <ClCompile Include="..\..\..\qemu\target\mips\helper.c">
+      <Filter>target\mips</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-mips\lmi_helper.c">
-      <Filter>target-mips</Filter>
+    <ClCompile Include="..\..\..\qemu\target\mips\lmi_helper.c">
+      <Filter>target\mips</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-mips\msa_helper.c">
-      <Filter>target-mips</Filter>
+    <ClCompile Include="..\..\..\qemu\target\mips\msa_helper.c">
+      <Filter>target\mips</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-mips\op_helper.c">
-      <Filter>target-mips</Filter>
+    <ClCompile Include="..\..\..\qemu\target\mips\op_helper.c">
+      <Filter>target\mips</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-mips\translate.c">
-      <Filter>target-mips</Filter>
+    <ClCompile Include="..\..\..\qemu\target\mips\translate.c">
+      <Filter>target\mips</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-mips\translate_init.c">
-      <Filter>target-mips</Filter>
+    <ClCompile Include="..\..\..\qemu\target\mips\translate_init.c">
+      <Filter>target\mips</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-mips\unicorn.c">
-      <Filter>target-mips</Filter>
+    <ClCompile Include="..\..\..\qemu\target\mips\unicorn.c">
+      <Filter>target\mips</Filter>
     </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/msvc/unicorn/mips64-softmmu/mips64-softmmu.vcxproj b/msvc/unicorn/mips64-softmmu/mips64-softmmu.vcxproj
index b213cd8b..7c534be0 100644
--- a/msvc/unicorn/mips64-softmmu/mips64-softmmu.vcxproj
+++ b/msvc/unicorn/mips64-softmmu/mips64-softmmu.vcxproj
@@ -21,11 +21,11 @@
   <ItemGroup>
     <ClInclude Include="..\..\..\qemu\fpu\softfloat-macros.h" />
     <ClInclude Include="..\..\..\qemu\fpu\softfloat-specialize.h" />
-    <ClInclude Include="..\..\..\qemu\target-mips\cpu-qom.h" />
-    <ClInclude Include="..\..\..\qemu\target-mips\cpu.h" />
-    <ClInclude Include="..\..\..\qemu\target-mips\helper.h" />
-    <ClInclude Include="..\..\..\qemu\target-mips\mips-defs.h" />
-    <ClInclude Include="..\..\..\qemu\target-mips\unicorn.h" />
+    <ClInclude Include="..\..\..\qemu\target\mips\cpu-qom.h" />
+    <ClInclude Include="..\..\..\qemu\target\mips\cpu.h" />
+    <ClInclude Include="..\..\..\qemu\target\mips\helper.h" />
+    <ClInclude Include="..\..\..\qemu\target\mips\mips-defs.h" />
+    <ClInclude Include="..\..\..\qemu\target\mips\unicorn.h" />
     <ClInclude Include="..\..\..\qemu\tcg\i386\tcg-target.h" />
     <ClInclude Include="..\..\..\qemu\tcg\tcg-be-ldst.h" />
     <ClInclude Include="..\..\..\qemu\tcg\tcg-be-null.h" />
@@ -50,20 +50,20 @@
     <ClCompile Include="..\..\..\qemu\ioport.c" />
     <ClCompile Include="..\..\..\qemu\memory.c" />
     <ClCompile Include="..\..\..\qemu\memory_mapping.c" />
-    <ClCompile Include="..\..\..\qemu\target-mips\cpu.c" />
-    <ClCompile Include="..\..\..\qemu\target-mips\dsp_helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-mips\helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-mips\lmi_helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-mips\msa_helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-mips\op_helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-mips\translate.c" />
-    <ClCompile Include="..\..\..\qemu\target-mips\translate_init.c">
+    <ClCompile Include="..\..\..\qemu\target\mips\cpu.c" />
+    <ClCompile Include="..\..\..\qemu\target\mips\dsp_helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\mips\helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\mips\lmi_helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\mips\msa_helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\mips\op_helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\mips\translate.c" />
+    <ClCompile Include="..\..\..\qemu\target\mips\translate_init.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-mips\unicorn.c" />
+    <ClCompile Include="..\..\..\qemu\target\mips\unicorn.c" />
     <ClCompile Include="..\..\..\qemu\tcg\i386\tcg-target.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -145,7 +145,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;__i386__;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;inline=__inline;__func__=__FUNCTION__;NEED_CPU_H;WIN32_LEAN_AND_MEAN</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target-mips;../../../include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target/mips;../../../include</AdditionalIncludeDirectories>
       <AdditionalOptions>/wd4018 /wd4244 /wd4267 %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <ExceptionHandling>false</ExceptionHandling>
@@ -166,7 +166,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;__x86_64__;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;inline=__inline;__func__=__FUNCTION__;NEED_CPU_H;WIN32_LEAN_AND_MEAN</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target-mips;../../../include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target/mips;../../../include</AdditionalIncludeDirectories>
       <AdditionalOptions>/wd4018 /wd4244 /wd4267 %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <ExceptionHandling>false</ExceptionHandling>
@@ -189,7 +189,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;__i386__;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;inline=__inline;__func__=__FUNCTION__;NEED_CPU_H;WIN32_LEAN_AND_MEAN</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target-mips;../../../include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target/mips;../../../include</AdditionalIncludeDirectories>
       <AdditionalOptions>/wd4018 /wd4244 /wd4267 %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <ExceptionHandling>false</ExceptionHandling>
@@ -215,7 +215,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;__x86_64__;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;inline=__inline;__func__=__FUNCTION__;NEED_CPU_H;WIN32_LEAN_AND_MEAN</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target-mips;../../../include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target/mips;../../../include</AdditionalIncludeDirectories>
       <AdditionalOptions>/wd4018 /wd4244 /wd4267 %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <ExceptionHandling>false</ExceptionHandling>
diff --git a/msvc/unicorn/mips64-softmmu/mips64-softmmu.vcxproj.filters b/msvc/unicorn/mips64-softmmu/mips64-softmmu.vcxproj.filters
index 097b0d2b..0e1e29f8 100644
--- a/msvc/unicorn/mips64-softmmu/mips64-softmmu.vcxproj.filters
+++ b/msvc/unicorn/mips64-softmmu/mips64-softmmu.vcxproj.filters
@@ -10,7 +10,7 @@
     <Filter Include="hw\mips">
       <UniqueIdentifier>{39b8b5d5-ffa1-4eb6-ab78-2edb05e49e84}</UniqueIdentifier>
     </Filter>
-    <Filter Include="target-mips">
+    <Filter Include="target\mips">
       <UniqueIdentifier>{a4e58c5f-5143-4c18-b291-2f472259d6d9}</UniqueIdentifier>
     </Filter>
     <Filter Include="tcg">
@@ -48,20 +48,20 @@
     <ClInclude Include="..\..\..\qemu\tcg\i386\tcg-target.h">
       <Filter>tcg\i386</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\target-mips\cpu.h">
-      <Filter>target-mips</Filter>
+    <ClInclude Include="..\..\..\qemu\target\mips\cpu.h">
+      <Filter>target\mips</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\target-mips\cpu-qom.h">
-      <Filter>target-mips</Filter>
+    <ClInclude Include="..\..\..\qemu\target\mips\cpu-qom.h">
+      <Filter>target\mips</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\target-mips\helper.h">
-      <Filter>target-mips</Filter>
+    <ClInclude Include="..\..\..\qemu\target\mips\helper.h">
+      <Filter>target\mips</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\target-mips\mips-defs.h">
-      <Filter>target-mips</Filter>
+    <ClInclude Include="..\..\..\qemu\target\mips\mips-defs.h">
+      <Filter>target\mips</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\target-mips\unicorn.h">
-      <Filter>target-mips</Filter>
+    <ClInclude Include="..\..\..\qemu\target\mips\unicorn.h">
+      <Filter>target\mips</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\qemu\mips64.h" />
     <ClInclude Include="..\config-host.h" />
@@ -101,32 +101,32 @@
     <ClCompile Include="..\..\..\qemu\tcg\i386\tcg-target.c">
       <Filter>tcg\i386</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-mips\cpu.c">
-      <Filter>target-mips</Filter>
+    <ClCompile Include="..\..\..\qemu\target\mips\cpu.c">
+      <Filter>target\mips</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-mips\dsp_helper.c">
-      <Filter>target-mips</Filter>
+    <ClCompile Include="..\..\..\qemu\target\mips\dsp_helper.c">
+      <Filter>target\mips</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-mips\helper.c">
-      <Filter>target-mips</Filter>
+    <ClCompile Include="..\..\..\qemu\target\mips\helper.c">
+      <Filter>target\mips</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-mips\lmi_helper.c">
-      <Filter>target-mips</Filter>
+    <ClCompile Include="..\..\..\qemu\target\mips\lmi_helper.c">
+      <Filter>target\mips</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-mips\msa_helper.c">
-      <Filter>target-mips</Filter>
+    <ClCompile Include="..\..\..\qemu\target\mips\msa_helper.c">
+      <Filter>target\mips</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-mips\op_helper.c">
-      <Filter>target-mips</Filter>
+    <ClCompile Include="..\..\..\qemu\target\mips\op_helper.c">
+      <Filter>target\mips</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-mips\translate.c">
-      <Filter>target-mips</Filter>
+    <ClCompile Include="..\..\..\qemu\target\mips\translate.c">
+      <Filter>target\mips</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-mips\translate_init.c">
-      <Filter>target-mips</Filter>
+    <ClCompile Include="..\..\..\qemu\target\mips\translate_init.c">
+      <Filter>target\mips</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-mips\unicorn.c">
-      <Filter>target-mips</Filter>
+    <ClCompile Include="..\..\..\qemu\target\mips\unicorn.c">
+      <Filter>target\mips</Filter>
     </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/msvc/unicorn/mips64el-softmmu/mips64el-softmmu.vcxproj b/msvc/unicorn/mips64el-softmmu/mips64el-softmmu.vcxproj
index f946101d..523f02f3 100644
--- a/msvc/unicorn/mips64el-softmmu/mips64el-softmmu.vcxproj
+++ b/msvc/unicorn/mips64el-softmmu/mips64el-softmmu.vcxproj
@@ -21,11 +21,11 @@
   <ItemGroup>
     <ClInclude Include="..\..\..\qemu\fpu\softfloat-macros.h" />
     <ClInclude Include="..\..\..\qemu\fpu\softfloat-specialize.h" />
-    <ClInclude Include="..\..\..\qemu\target-mips\cpu-qom.h" />
-    <ClInclude Include="..\..\..\qemu\target-mips\cpu.h" />
-    <ClInclude Include="..\..\..\qemu\target-mips\helper.h" />
-    <ClInclude Include="..\..\..\qemu\target-mips\mips-defs.h" />
-    <ClInclude Include="..\..\..\qemu\target-mips\unicorn.h" />
+    <ClInclude Include="..\..\..\qemu\target\mips\cpu-qom.h" />
+    <ClInclude Include="..\..\..\qemu\target\mips\cpu.h" />
+    <ClInclude Include="..\..\..\qemu\target\mips\helper.h" />
+    <ClInclude Include="..\..\..\qemu\target\mips\mips-defs.h" />
+    <ClInclude Include="..\..\..\qemu\target\mips\unicorn.h" />
     <ClInclude Include="..\..\..\qemu\tcg\i386\tcg-target.h" />
     <ClInclude Include="..\..\..\qemu\tcg\tcg-be-ldst.h" />
     <ClInclude Include="..\..\..\qemu\tcg\tcg-be-null.h" />
@@ -50,20 +50,20 @@
     <ClCompile Include="..\..\..\qemu\ioport.c" />
     <ClCompile Include="..\..\..\qemu\memory.c" />
     <ClCompile Include="..\..\..\qemu\memory_mapping.c" />
-    <ClCompile Include="..\..\..\qemu\target-mips\cpu.c" />
-    <ClCompile Include="..\..\..\qemu\target-mips\dsp_helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-mips\helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-mips\lmi_helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-mips\msa_helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-mips\op_helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-mips\translate.c" />
-    <ClCompile Include="..\..\..\qemu\target-mips\translate_init.c">
+    <ClCompile Include="..\..\..\qemu\target\mips\cpu.c" />
+    <ClCompile Include="..\..\..\qemu\target\mips\dsp_helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\mips\helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\mips\lmi_helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\mips\msa_helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\mips\op_helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\mips\translate.c" />
+    <ClCompile Include="..\..\..\qemu\target\mips\translate_init.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-mips\unicorn.c" />
+    <ClCompile Include="..\..\..\qemu\target\mips\unicorn.c" />
     <ClCompile Include="..\..\..\qemu\tcg\i386\tcg-target.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -145,7 +145,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;__i386__;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;inline=__inline;__func__=__FUNCTION__;NEED_CPU_H;WIN32_LEAN_AND_MEAN</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target-mips;../../../include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target/mips;../../../include</AdditionalIncludeDirectories>
       <AdditionalOptions>/wd4018 /wd4244 /wd4267 %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <ExceptionHandling>false</ExceptionHandling>
@@ -166,7 +166,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;__x86_64__;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;inline=__inline;__func__=__FUNCTION__;NEED_CPU_H;WIN32_LEAN_AND_MEAN</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target-mips;../../../include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target/mips;../../../include</AdditionalIncludeDirectories>
       <AdditionalOptions>/wd4018 /wd4244 /wd4267 %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <ExceptionHandling>false</ExceptionHandling>
@@ -189,7 +189,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;__i386__;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;inline=__inline;__func__=__FUNCTION__;NEED_CPU_H;WIN32_LEAN_AND_MEAN</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target-mips;../../../include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target/mips;../../../include</AdditionalIncludeDirectories>
       <AdditionalOptions>/wd4018 /wd4244 /wd4267 %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <ExceptionHandling>false</ExceptionHandling>
@@ -215,7 +215,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;__x86_64__;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;inline=__inline;__func__=__FUNCTION__;NEED_CPU_H;WIN32_LEAN_AND_MEAN</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target-mips;../../../include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target/mips;../../../include</AdditionalIncludeDirectories>
       <AdditionalOptions>/wd4018 /wd4244 /wd4267 %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <ExceptionHandling>false</ExceptionHandling>
diff --git a/msvc/unicorn/mips64el-softmmu/mips64el-softmmu.vcxproj.filters b/msvc/unicorn/mips64el-softmmu/mips64el-softmmu.vcxproj.filters
index 2283c9bb..14134ad6 100644
--- a/msvc/unicorn/mips64el-softmmu/mips64el-softmmu.vcxproj.filters
+++ b/msvc/unicorn/mips64el-softmmu/mips64el-softmmu.vcxproj.filters
@@ -10,7 +10,7 @@
     <Filter Include="hw\mips">
       <UniqueIdentifier>{2253570a-0bc0-4366-9eab-095257ab37b2}</UniqueIdentifier>
     </Filter>
-    <Filter Include="target-mips">
+    <Filter Include="target\mips">
       <UniqueIdentifier>{de33cbbc-f374-4451-a083-23c5a98c843e}</UniqueIdentifier>
     </Filter>
     <Filter Include="tcg">
@@ -48,20 +48,20 @@
     <ClInclude Include="..\..\..\qemu\tcg\i386\tcg-target.h">
       <Filter>tcg\i386</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\target-mips\cpu.h">
-      <Filter>target-mips</Filter>
+    <ClInclude Include="..\..\..\qemu\target\mips\cpu.h">
+      <Filter>target\mips</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\target-mips\cpu-qom.h">
-      <Filter>target-mips</Filter>
+    <ClInclude Include="..\..\..\qemu\target\mips\cpu-qom.h">
+      <Filter>target\mips</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\target-mips\helper.h">
-      <Filter>target-mips</Filter>
+    <ClInclude Include="..\..\..\qemu\target\mips\helper.h">
+      <Filter>target\mips</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\target-mips\mips-defs.h">
-      <Filter>target-mips</Filter>
+    <ClInclude Include="..\..\..\qemu\target\mips\mips-defs.h">
+      <Filter>target\mips</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\target-mips\unicorn.h">
-      <Filter>target-mips</Filter>
+    <ClInclude Include="..\..\..\qemu\target\mips\unicorn.h">
+      <Filter>target\mips</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\qemu\mips64el.h" />
     <ClInclude Include="..\config-host.h" />
@@ -102,32 +102,32 @@
     <ClCompile Include="..\..\..\qemu\tcg\i386\tcg-target.c">
       <Filter>tcg\i386</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-mips\cpu.c">
-      <Filter>target-mips</Filter>
+    <ClCompile Include="..\..\..\qemu\target\mips\cpu.c">
+      <Filter>target\mips</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-mips\dsp_helper.c">
-      <Filter>target-mips</Filter>
+    <ClCompile Include="..\..\..\qemu\target\mips\dsp_helper.c">
+      <Filter>target\mips</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-mips\helper.c">
-      <Filter>target-mips</Filter>
+    <ClCompile Include="..\..\..\qemu\target\mips\helper.c">
+      <Filter>target\mips</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-mips\lmi_helper.c">
-      <Filter>target-mips</Filter>
+    <ClCompile Include="..\..\..\qemu\target\mips\lmi_helper.c">
+      <Filter>target\mips</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-mips\msa_helper.c">
-      <Filter>target-mips</Filter>
+    <ClCompile Include="..\..\..\qemu\target\mips\msa_helper.c">
+      <Filter>target\mips</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-mips\op_helper.c">
-      <Filter>target-mips</Filter>
+    <ClCompile Include="..\..\..\qemu\target\mips\op_helper.c">
+      <Filter>target\mips</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-mips\translate.c">
-      <Filter>target-mips</Filter>
+    <ClCompile Include="..\..\..\qemu\target\mips\translate.c">
+      <Filter>target\mips</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-mips\translate_init.c">
-      <Filter>target-mips</Filter>
+    <ClCompile Include="..\..\..\qemu\target\mips\translate_init.c">
+      <Filter>target\mips</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-mips\unicorn.c">
-      <Filter>target-mips</Filter>
+    <ClCompile Include="..\..\..\qemu\target\mips\unicorn.c">
+      <Filter>target\mips</Filter>
     </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/msvc/unicorn/mipsel-softmmu/mipsel-softmmu.vcxproj b/msvc/unicorn/mipsel-softmmu/mipsel-softmmu.vcxproj
index 3de54c7f..e37410f5 100644
--- a/msvc/unicorn/mipsel-softmmu/mipsel-softmmu.vcxproj
+++ b/msvc/unicorn/mipsel-softmmu/mipsel-softmmu.vcxproj
@@ -21,11 +21,11 @@
   <ItemGroup>
     <ClInclude Include="..\..\..\qemu\fpu\softfloat-macros.h" />
     <ClInclude Include="..\..\..\qemu\fpu\softfloat-specialize.h" />
-    <ClInclude Include="..\..\..\qemu\target-mips\cpu-qom.h" />
-    <ClInclude Include="..\..\..\qemu\target-mips\cpu.h" />
-    <ClInclude Include="..\..\..\qemu\target-mips\helper.h" />
-    <ClInclude Include="..\..\..\qemu\target-mips\mips-defs.h" />
-    <ClInclude Include="..\..\..\qemu\target-mips\unicorn.h" />
+    <ClInclude Include="..\..\..\qemu\target\mips\cpu-qom.h" />
+    <ClInclude Include="..\..\..\qemu\target\mips\cpu.h" />
+    <ClInclude Include="..\..\..\qemu\target\mips\helper.h" />
+    <ClInclude Include="..\..\..\qemu\target\mips\mips-defs.h" />
+    <ClInclude Include="..\..\..\qemu\target\mips\unicorn.h" />
     <ClInclude Include="..\..\..\qemu\tcg\i386\tcg-target.h" />
     <ClInclude Include="..\..\..\qemu\tcg\tcg-be-ldst.h" />
     <ClInclude Include="..\..\..\qemu\tcg\tcg-be-null.h" />
@@ -50,20 +50,20 @@
     <ClCompile Include="..\..\..\qemu\ioport.c" />
     <ClCompile Include="..\..\..\qemu\memory.c" />
     <ClCompile Include="..\..\..\qemu\memory_mapping.c" />
-    <ClCompile Include="..\..\..\qemu\target-mips\cpu.c" />
-    <ClCompile Include="..\..\..\qemu\target-mips\dsp_helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-mips\helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-mips\lmi_helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-mips\msa_helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-mips\op_helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-mips\translate.c" />
-    <ClCompile Include="..\..\..\qemu\target-mips\translate_init.c">
+    <ClCompile Include="..\..\..\qemu\target\mips\cpu.c" />
+    <ClCompile Include="..\..\..\qemu\target\mips\dsp_helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\mips\helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\mips\lmi_helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\mips\msa_helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\mips\op_helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\mips\translate.c" />
+    <ClCompile Include="..\..\..\qemu\target\mips\translate_init.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-mips\unicorn.c" />
+    <ClCompile Include="..\..\..\qemu\target\mips\unicorn.c" />
     <ClCompile Include="..\..\..\qemu\tcg\i386\tcg-target.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -145,7 +145,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;__i386__;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;inline=__inline;__func__=__FUNCTION__;NEED_CPU_H;WIN32_LEAN_AND_MEAN</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target-mips;../../../include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target/mips;../../../include</AdditionalIncludeDirectories>
       <AdditionalOptions>/wd4018 /wd4244 /wd4267 %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <ExceptionHandling>false</ExceptionHandling>
@@ -166,7 +166,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;__x86_64__;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;inline=__inline;__func__=__FUNCTION__;NEED_CPU_H;WIN32_LEAN_AND_MEAN</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target-mips;../../../include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target/mips;../../../include</AdditionalIncludeDirectories>
       <AdditionalOptions>/wd4018 /wd4244 /wd4267 %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <ExceptionHandling>false</ExceptionHandling>
@@ -189,7 +189,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;__i386__;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;inline=__inline;__func__=__FUNCTION__;NEED_CPU_H;WIN32_LEAN_AND_MEAN</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target-mips;../../../include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target/mips;../../../include</AdditionalIncludeDirectories>
       <AdditionalOptions>/wd4018 /wd4244 /wd4267 %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <ExceptionHandling>false</ExceptionHandling>
@@ -215,7 +215,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;__x86_64__;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;inline=__inline;__func__=__FUNCTION__;NEED_CPU_H;WIN32_LEAN_AND_MEAN</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target-mips;../../../include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target/mips;../../../include</AdditionalIncludeDirectories>
       <AdditionalOptions>/wd4018 /wd4244 /wd4267 %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <ExceptionHandling>false</ExceptionHandling>
diff --git a/msvc/unicorn/mipsel-softmmu/mipsel-softmmu.vcxproj.filters b/msvc/unicorn/mipsel-softmmu/mipsel-softmmu.vcxproj.filters
index cc7fcf08..836ebd34 100644
--- a/msvc/unicorn/mipsel-softmmu/mipsel-softmmu.vcxproj.filters
+++ b/msvc/unicorn/mipsel-softmmu/mipsel-softmmu.vcxproj.filters
@@ -10,7 +10,7 @@
     <Filter Include="hw\mips">
       <UniqueIdentifier>{b2a1fb8b-789a-45a6-a814-9312ad75bd70}</UniqueIdentifier>
     </Filter>
-    <Filter Include="target-mips">
+    <Filter Include="target\mips">
       <UniqueIdentifier>{e6bea1c8-7307-44c8-9956-25321f73287f}</UniqueIdentifier>
     </Filter>
     <Filter Include="tcg">
@@ -48,20 +48,20 @@
     <ClInclude Include="..\..\..\qemu\tcg\i386\tcg-target.h">
       <Filter>tcg\i386</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\target-mips\cpu.h">
-      <Filter>target-mips</Filter>
+    <ClInclude Include="..\..\..\qemu\target\mips\cpu.h">
+      <Filter>target\mips</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\target-mips\cpu-qom.h">
-      <Filter>target-mips</Filter>
+    <ClInclude Include="..\..\..\qemu\target\mips\cpu-qom.h">
+      <Filter>target\mips</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\target-mips\helper.h">
-      <Filter>target-mips</Filter>
+    <ClInclude Include="..\..\..\qemu\target\mips\helper.h">
+      <Filter>target\mips</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\target-mips\mips-defs.h">
-      <Filter>target-mips</Filter>
+    <ClInclude Include="..\..\..\qemu\target\mips\mips-defs.h">
+      <Filter>target\mips</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\target-mips\unicorn.h">
-      <Filter>target-mips</Filter>
+    <ClInclude Include="..\..\..\qemu\target\mips\unicorn.h">
+      <Filter>target\mips</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\qemu\mipsel.h" />
     <ClInclude Include="..\config-host.h" />
@@ -100,32 +100,32 @@
     <ClCompile Include="..\..\..\qemu\tcg\i386\tcg-target.c">
       <Filter>tcg\i386</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-mips\cpu.c">
-      <Filter>target-mips</Filter>
+    <ClCompile Include="..\..\..\qemu\target\mips\cpu.c">
+      <Filter>target\mips</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-mips\dsp_helper.c">
-      <Filter>target-mips</Filter>
+    <ClCompile Include="..\..\..\qemu\target\mips\dsp_helper.c">
+      <Filter>target\mips</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-mips\helper.c">
-      <Filter>target-mips</Filter>
+    <ClCompile Include="..\..\..\qemu\target\mips\helper.c">
+      <Filter>target\mips</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-mips\lmi_helper.c">
-      <Filter>target-mips</Filter>
+    <ClCompile Include="..\..\..\qemu\target\mips\lmi_helper.c">
+      <Filter>target\mips</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-mips\msa_helper.c">
-      <Filter>target-mips</Filter>
+    <ClCompile Include="..\..\..\qemu\target\mips\msa_helper.c">
+      <Filter>target\mips</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-mips\op_helper.c">
-      <Filter>target-mips</Filter>
+    <ClCompile Include="..\..\..\qemu\target\mips\op_helper.c">
+      <Filter>target\mips</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-mips\translate.c">
-      <Filter>target-mips</Filter>
+    <ClCompile Include="..\..\..\qemu\target\mips\translate.c">
+      <Filter>target\mips</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-mips\translate_init.c">
-      <Filter>target-mips</Filter>
+    <ClCompile Include="..\..\..\qemu\target\mips\translate_init.c">
+      <Filter>target\mips</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-mips\unicorn.c">
-      <Filter>target-mips</Filter>
+    <ClCompile Include="..\..\..\qemu\target\mips\unicorn.c">
+      <Filter>target\mips</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\qemu\translate-all.c" />
     <ClCompile Include="..\..\..\qemu\translate-common.c" />
diff --git a/msvc/unicorn/sparc-softmmu/sparc-softmmu.vcxproj b/msvc/unicorn/sparc-softmmu/sparc-softmmu.vcxproj
index 1229def7..05b5511c 100644
--- a/msvc/unicorn/sparc-softmmu/sparc-softmmu.vcxproj
+++ b/msvc/unicorn/sparc-softmmu/sparc-softmmu.vcxproj
@@ -28,11 +28,11 @@
     <ClInclude Include="..\..\..\qemu\tcg\tcg-opc.h" />
     <ClInclude Include="..\..\..\qemu\tcg\tcg-runtime.h" />
     <ClInclude Include="..\..\..\qemu\tcg\tcg.h" />
-    <ClInclude Include="..\..\..\qemu\target-sparc\cpu-qom.h" />
-    <ClInclude Include="..\..\..\qemu\target-sparc\cpu.h" />
-    <ClInclude Include="..\..\..\qemu\target-sparc\asi.h" />
-    <ClInclude Include="..\..\..\qemu\target-sparc\helper.h" />
-    <ClInclude Include="..\..\..\qemu\target-sparc\unicorn.h" />
+    <ClInclude Include="..\..\..\qemu\target\sparc\cpu-qom.h" />
+    <ClInclude Include="..\..\..\qemu\target\sparc\cpu.h" />
+    <ClInclude Include="..\..\..\qemu\target\sparc\asi.h" />
+    <ClInclude Include="..\..\..\qemu\target\sparc\helper.h" />
+    <ClInclude Include="..\..\..\qemu\target\sparc\unicorn.h" />
     <ClInclude Include="..\..\..\qemu\sparc.h" />
     <ClInclude Include="..\config-host.h" />
     <ClInclude Include="config-target.h" />
@@ -48,16 +48,16 @@
     <ClCompile Include="..\..\..\qemu\ioport.c" />
     <ClCompile Include="..\..\..\qemu\memory.c" />
     <ClCompile Include="..\..\..\qemu\memory_mapping.c" />
-    <ClCompile Include="..\..\..\qemu\target-sparc\cc_helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-sparc\cpu.c" />
-    <ClCompile Include="..\..\..\qemu\target-sparc\fop_helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-sparc\helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-sparc\int32_helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-sparc\ldst_helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-sparc\mmu_helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-sparc\translate.c" />
-    <ClCompile Include="..\..\..\qemu\target-sparc\unicorn.c" />
-    <ClCompile Include="..\..\..\qemu\target-sparc\win_helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\sparc\cc_helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\sparc\cpu.c" />
+    <ClCompile Include="..\..\..\qemu\target\sparc\fop_helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\sparc\helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\sparc\int32_helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\sparc\ldst_helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\sparc\mmu_helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\sparc\translate.c" />
+    <ClCompile Include="..\..\..\qemu\target\sparc\unicorn.c" />
+    <ClCompile Include="..\..\..\qemu\target\sparc\win_helper.c" />
     <ClCompile Include="..\..\..\qemu\tcg\i386\tcg-target.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -139,7 +139,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;__i386__;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;inline=__inline;__func__=__FUNCTION__;NEED_CPU_H;WIN32_LEAN_AND_MEAN</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target-sparc;../../../include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target/sparc;../../../include</AdditionalIncludeDirectories>
       <AdditionalOptions>/wd4018 /wd4244 /wd4267 %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <ExceptionHandling>false</ExceptionHandling>
@@ -160,7 +160,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;__x86_64__;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;inline=__inline;__func__=__FUNCTION__;NEED_CPU_H;WIN32_LEAN_AND_MEAN</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target-sparc;../../../include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target/sparc;../../../include</AdditionalIncludeDirectories>
       <AdditionalOptions>/wd4018 /wd4244 /wd4267 %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <ExceptionHandling>false</ExceptionHandling>
@@ -183,7 +183,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;__i386__;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;inline=__inline;__func__=__FUNCTION__;NEED_CPU_H;WIN32_LEAN_AND_MEAN</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target-sparc;../../../include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target/sparc;../../../include</AdditionalIncludeDirectories>
       <AdditionalOptions>/wd4018 /wd4244 /wd4267 %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <ExceptionHandling>false</ExceptionHandling>
@@ -209,7 +209,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;__x86_64__;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;inline=__inline;__func__=__FUNCTION__;NEED_CPU_H;WIN32_LEAN_AND_MEAN</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target-sparc;../../../include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target/sparc;../../../include</AdditionalIncludeDirectories>
       <AdditionalOptions>/wd4018 /wd4244 /wd4267 %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <ExceptionHandling>false</ExceptionHandling>
diff --git a/msvc/unicorn/sparc-softmmu/sparc-softmmu.vcxproj.filters b/msvc/unicorn/sparc-softmmu/sparc-softmmu.vcxproj.filters
index 77abca9d..fefa9180 100644
--- a/msvc/unicorn/sparc-softmmu/sparc-softmmu.vcxproj.filters
+++ b/msvc/unicorn/sparc-softmmu/sparc-softmmu.vcxproj.filters
@@ -10,7 +10,7 @@
     <Filter Include="hw\sparc">
       <UniqueIdentifier>{0a04b798-735c-4115-ab62-b6cfc772efed}</UniqueIdentifier>
     </Filter>
-    <Filter Include="target-sparc">
+    <Filter Include="target\sparc">
       <UniqueIdentifier>{10f0c533-e16b-4e31-b979-812af068bb36}</UniqueIdentifier>
     </Filter>
     <Filter Include="tcg">
@@ -48,20 +48,20 @@
     <ClInclude Include="..\..\..\qemu\tcg\i386\tcg-target.h">
       <Filter>tcg\i386</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\target-sparc\cpu.h">
-      <Filter>target-sparc</Filter>
+    <ClInclude Include="..\..\..\qemu\target\sparc\cpu.h">
+      <Filter>target\sparc</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\target-sparc\cpu-qom.h">
-      <Filter>target-sparc</Filter>
+    <ClInclude Include="..\..\..\qemu\target\sparc\cpu-qom.h">
+      <Filter>target\sparc</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\target-sparc\asi.h">
-      <Filter>target-sparc</Filter>
+    <ClInclude Include="..\..\..\qemu\target\sparc\asi.h">
+      <Filter>target\sparc</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\target-sparc\helper.h">
-      <Filter>target-sparc</Filter>
+    <ClInclude Include="..\..\..\qemu\target\sparc\helper.h">
+      <Filter>target\sparc</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\target-sparc\unicorn.h">
-      <Filter>target-sparc</Filter>
+    <ClInclude Include="..\..\..\qemu\target\sparc\unicorn.h">
+      <Filter>target\sparc</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\qemu\sparc.h" />
     <ClInclude Include="..\config-host.h" />
@@ -96,35 +96,35 @@
     <ClCompile Include="..\..\..\qemu\hw\sparc\leon3.c">
       <Filter>hw\sparc</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-sparc\fop_helper.c">
-      <Filter>target-sparc</Filter>
+    <ClCompile Include="..\..\..\qemu\target\sparc\fop_helper.c">
+      <Filter>target\sparc</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-sparc\helper.c">
-      <Filter>target-sparc</Filter>
+    <ClCompile Include="..\..\..\qemu\target\sparc\helper.c">
+      <Filter>target\sparc</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-sparc\ldst_helper.c">
-      <Filter>target-sparc</Filter>
+    <ClCompile Include="..\..\..\qemu\target\sparc\ldst_helper.c">
+      <Filter>target\sparc</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-sparc\mmu_helper.c">
-      <Filter>target-sparc</Filter>
+    <ClCompile Include="..\..\..\qemu\target\sparc\mmu_helper.c">
+      <Filter>target\sparc</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-sparc\translate.c">
-      <Filter>target-sparc</Filter>
+    <ClCompile Include="..\..\..\qemu\target\sparc\translate.c">
+      <Filter>target\sparc</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-sparc\win_helper.c">
-      <Filter>target-sparc</Filter>
+    <ClCompile Include="..\..\..\qemu\target\sparc\win_helper.c">
+      <Filter>target\sparc</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-sparc\cc_helper.c">
-      <Filter>target-sparc</Filter>
+    <ClCompile Include="..\..\..\qemu\target\sparc\cc_helper.c">
+      <Filter>target\sparc</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-sparc\cpu.c">
-      <Filter>target-sparc</Filter>
+    <ClCompile Include="..\..\..\qemu\target\sparc\cpu.c">
+      <Filter>target\sparc</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-sparc\unicorn.c">
-      <Filter>target-sparc</Filter>
+    <ClCompile Include="..\..\..\qemu\target\sparc\unicorn.c">
+      <Filter>target\sparc</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-sparc\int32_helper.c">
-      <Filter>target-sparc</Filter>
+    <ClCompile Include="..\..\..\qemu\target\sparc\int32_helper.c">
+      <Filter>target\sparc</Filter>
     </ClCompile>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/msvc/unicorn/sparc64-softmmu/sparc64-softmmu.vcxproj b/msvc/unicorn/sparc64-softmmu/sparc64-softmmu.vcxproj
index 54585761..5f20c2d7 100644
--- a/msvc/unicorn/sparc64-softmmu/sparc64-softmmu.vcxproj
+++ b/msvc/unicorn/sparc64-softmmu/sparc64-softmmu.vcxproj
@@ -28,11 +28,11 @@
     <ClInclude Include="..\..\..\qemu\tcg\tcg-opc.h" />
     <ClInclude Include="..\..\..\qemu\tcg\tcg-runtime.h" />
     <ClInclude Include="..\..\..\qemu\tcg\tcg.h" />
-    <ClInclude Include="..\..\..\qemu\target-sparc\cpu-qom.h" />
-    <ClInclude Include="..\..\..\qemu\target-sparc\cpu.h" />
-    <ClInclude Include="..\..\..\qemu\target-sparc\asi.h" />
-    <ClInclude Include="..\..\..\qemu\target-sparc\helper.h" />
-    <ClInclude Include="..\..\..\qemu\target-sparc\unicorn.h" />
+    <ClInclude Include="..\..\..\qemu\target\sparc\cpu-qom.h" />
+    <ClInclude Include="..\..\..\qemu\target\sparc\cpu.h" />
+    <ClInclude Include="..\..\..\qemu\target\sparc\asi.h" />
+    <ClInclude Include="..\..\..\qemu\target\sparc\helper.h" />
+    <ClInclude Include="..\..\..\qemu\target\sparc\unicorn.h" />
     <ClInclude Include="..\..\..\qemu\sparc64.h" />
     <ClInclude Include="..\config-host.h" />
     <ClInclude Include="config-target.h" />
@@ -48,17 +48,17 @@
     <ClCompile Include="..\..\..\qemu\ioport.c" />
     <ClCompile Include="..\..\..\qemu\memory.c" />
     <ClCompile Include="..\..\..\qemu\memory_mapping.c" />
-    <ClCompile Include="..\..\..\qemu\target-sparc\cc_helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-sparc\cpu.c" />
-    <ClCompile Include="..\..\..\qemu\target-sparc\fop_helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-sparc\helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-sparc\int64_helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-sparc\ldst_helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-sparc\mmu_helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-sparc\translate.c" />
-    <ClCompile Include="..\..\..\qemu\target-sparc\unicorn64.c" />
-    <ClCompile Include="..\..\..\qemu\target-sparc\vis_helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-sparc\win_helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\sparc\cc_helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\sparc\cpu.c" />
+    <ClCompile Include="..\..\..\qemu\target\sparc\fop_helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\sparc\helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\sparc\int64_helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\sparc\ldst_helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\sparc\mmu_helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\sparc\translate.c" />
+    <ClCompile Include="..\..\..\qemu\target\sparc\unicorn64.c" />
+    <ClCompile Include="..\..\..\qemu\target\sparc\vis_helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\sparc\win_helper.c" />
     <ClCompile Include="..\..\..\qemu\tcg\i386\tcg-target.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -140,7 +140,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;__i386__;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;inline=__inline;__func__=__FUNCTION__;NEED_CPU_H;WIN32_LEAN_AND_MEAN</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target-sparc;../../../include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target/sparc;../../../include</AdditionalIncludeDirectories>
       <AdditionalOptions>/wd4018 /wd4244 /wd4267 %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <ExceptionHandling>false</ExceptionHandling>
@@ -161,7 +161,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;__x86_64__;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;inline=__inline;__func__=__FUNCTION__;NEED_CPU_H;WIN32_LEAN_AND_MEAN</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target-sparc;../../../include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target/sparc;../../../include</AdditionalIncludeDirectories>
       <AdditionalOptions>/wd4018 /wd4244 /wd4267 %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <ExceptionHandling>false</ExceptionHandling>
@@ -184,7 +184,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;__i386__;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;inline=__inline;__func__=__FUNCTION__;NEED_CPU_H;WIN32_LEAN_AND_MEAN</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target-sparc;../../../include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target/sparc;../../../include</AdditionalIncludeDirectories>
       <AdditionalOptions>/wd4018 /wd4244 /wd4267 %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <ExceptionHandling>false</ExceptionHandling>
@@ -210,7 +210,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;__x86_64__;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;inline=__inline;__func__=__FUNCTION__;NEED_CPU_H;WIN32_LEAN_AND_MEAN</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target-sparc;../../../include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target/sparc;../../../include</AdditionalIncludeDirectories>
       <AdditionalOptions>/wd4018 /wd4244 /wd4267 %(AdditionalOptions)</AdditionalOptions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <ExceptionHandling>false</ExceptionHandling>
diff --git a/msvc/unicorn/sparc64-softmmu/sparc64-softmmu.vcxproj.filters b/msvc/unicorn/sparc64-softmmu/sparc64-softmmu.vcxproj.filters
index f0de4207..3ec52d3d 100644
--- a/msvc/unicorn/sparc64-softmmu/sparc64-softmmu.vcxproj.filters
+++ b/msvc/unicorn/sparc64-softmmu/sparc64-softmmu.vcxproj.filters
@@ -10,7 +10,7 @@
     <Filter Include="hw\sparc64">
       <UniqueIdentifier>{46e355ab-da0b-431b-929b-8d77b3ab90bc}</UniqueIdentifier>
     </Filter>
-    <Filter Include="target-sparc">
+    <Filter Include="target\sparc">
       <UniqueIdentifier>{1f15e2b2-fae3-41e5-b787-70c44beb828c}</UniqueIdentifier>
     </Filter>
     <Filter Include="tcg">
@@ -48,58 +48,58 @@
     <ClInclude Include="..\..\..\qemu\tcg\i386\tcg-target.h">
       <Filter>tcg\i386</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\target-sparc\cpu.h">
-      <Filter>target-sparc</Filter>
+    <ClInclude Include="..\..\..\qemu\target\sparc\cpu.h">
+      <Filter>target\sparc</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\target-sparc\cpu-qom.h">
-      <Filter>target-sparc</Filter>
+    <ClInclude Include="..\..\..\qemu\target\sparc\cpu-qom.h">
+      <Filter>target\sparc</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\target-sparc\asi.h">
-      <Filter>target-sparc</Filter>
+    <ClInclude Include="..\..\..\qemu\target\sparc\asi.h">
+      <Filter>target\sparc</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\target-sparc\helper.h">
-      <Filter>target-sparc</Filter>
+    <ClInclude Include="..\..\..\qemu\target\sparc\helper.h">
+      <Filter>target\sparc</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\target-sparc\unicorn.h">
-      <Filter>target-sparc</Filter>
+    <ClInclude Include="..\..\..\qemu\target\sparc\unicorn.h">
+      <Filter>target\sparc</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\qemu\sparc64.h" />
     <ClInclude Include="..\config-host.h" />
     <ClInclude Include="config-target.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\qemu\target-sparc\cc_helper.c">
-      <Filter>target-sparc</Filter>
+    <ClCompile Include="..\..\..\qemu\target\sparc\cc_helper.c">
+      <Filter>target\sparc</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-sparc\cpu.c">
-      <Filter>target-sparc</Filter>
+    <ClCompile Include="..\..\..\qemu\target\sparc\cpu.c">
+      <Filter>target\sparc</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-sparc\fop_helper.c">
-      <Filter>target-sparc</Filter>
+    <ClCompile Include="..\..\..\qemu\target\sparc\fop_helper.c">
+      <Filter>target\sparc</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-sparc\helper.c">
-      <Filter>target-sparc</Filter>
+    <ClCompile Include="..\..\..\qemu\target\sparc\helper.c">
+      <Filter>target\sparc</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-sparc\ldst_helper.c">
-      <Filter>target-sparc</Filter>
+    <ClCompile Include="..\..\..\qemu\target\sparc\ldst_helper.c">
+      <Filter>target\sparc</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-sparc\mmu_helper.c">
-      <Filter>target-sparc</Filter>
+    <ClCompile Include="..\..\..\qemu\target\sparc\mmu_helper.c">
+      <Filter>target\sparc</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-sparc\translate.c">
-      <Filter>target-sparc</Filter>
+    <ClCompile Include="..\..\..\qemu\target\sparc\translate.c">
+      <Filter>target\sparc</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-sparc\win_helper.c">
-      <Filter>target-sparc</Filter>
+    <ClCompile Include="..\..\..\qemu\target\sparc\win_helper.c">
+      <Filter>target\sparc</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-sparc\vis_helper.c">
-      <Filter>target-sparc</Filter>
+    <ClCompile Include="..\..\..\qemu\target\sparc\vis_helper.c">
+      <Filter>target\sparc</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-sparc\int64_helper.c">
-      <Filter>target-sparc</Filter>
+    <ClCompile Include="..\..\..\qemu\target\sparc\int64_helper.c">
+      <Filter>target\sparc</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\..\qemu\target-sparc\unicorn64.c">
-      <Filter>target-sparc</Filter>
+    <ClCompile Include="..\..\..\qemu\target\sparc\unicorn64.c">
+      <Filter>target\sparc</Filter>
     </ClCompile>
     <ClCompile Include="..\..\..\qemu\fpu\softfloat.c">
       <Filter>fpu</Filter>
diff --git a/msvc/unicorn/x86_64-softmmu/x86_64-softmmu.vcxproj b/msvc/unicorn/x86_64-softmmu/x86_64-softmmu.vcxproj
index 89d29b8c..04151210 100644
--- a/msvc/unicorn/x86_64-softmmu/x86_64-softmmu.vcxproj
+++ b/msvc/unicorn/x86_64-softmmu/x86_64-softmmu.vcxproj
@@ -21,16 +21,16 @@
   <ItemGroup>
     <ClInclude Include="..\..\..\qemu\fpu\softfloat-macros.h" />
     <ClInclude Include="..\..\..\qemu\fpu\softfloat-specialize.h" />
-    <ClInclude Include="..\..\..\qemu\target-i386\cc_helper_template.h" />
-    <ClInclude Include="..\..\..\qemu\target-i386\cpu-qom.h" />
-    <ClInclude Include="..\..\..\qemu\target-i386\cpu.h" />
-    <ClInclude Include="..\..\..\qemu\target-i386\helper.h" />
-    <ClInclude Include="..\..\..\qemu\target-i386\ops_sse.h" />
-    <ClInclude Include="..\..\..\qemu\target-i386\ops_sse_header.h" />
-    <ClInclude Include="..\..\..\qemu\target-i386\shift_helper_template.h" />
-    <ClInclude Include="..\..\..\qemu\target-i386\svm.h" />
-    <ClInclude Include="..\..\..\qemu\target-i386\topology.h" />
-    <ClInclude Include="..\..\..\qemu\target-i386\unicorn.h" />
+    <ClInclude Include="..\..\..\qemu\target\i386\cc_helper_template.h" />
+    <ClInclude Include="..\..\..\qemu\target\i386\cpu-qom.h" />
+    <ClInclude Include="..\..\..\qemu\target\i386\cpu.h" />
+    <ClInclude Include="..\..\..\qemu\target\i386\helper.h" />
+    <ClInclude Include="..\..\..\qemu\target\i386\ops_sse.h" />
+    <ClInclude Include="..\..\..\qemu\target\i386\ops_sse_header.h" />
+    <ClInclude Include="..\..\..\qemu\target\i386\shift_helper_template.h" />
+    <ClInclude Include="..\..\..\qemu\target\i386\svm.h" />
+    <ClInclude Include="..\..\..\qemu\target\i386\topology.h" />
+    <ClInclude Include="..\..\..\qemu\target\i386\unicorn.h" />
     <ClInclude Include="..\..\..\qemu\tcg\i386\tcg-target.h" />
     <ClInclude Include="..\..\..\qemu\tcg\tcg-be-ldst.h" />
     <ClInclude Include="..\..\..\qemu\tcg\tcg-be-null.h" />
@@ -56,22 +56,22 @@
     <ClCompile Include="..\..\..\qemu\ioport.c" />
     <ClCompile Include="..\..\..\qemu\memory.c" />
     <ClCompile Include="..\..\..\qemu\memory_mapping.c" />
-    <ClCompile Include="..\..\..\qemu\target-i386\arch_memory_mapping.c" />
-    <ClCompile Include="..\..\..\qemu\target-i386\bpt_helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-i386\cc_helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-i386\cpu.c" />
-    <ClCompile Include="..\..\..\qemu\target-i386\excp_helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-i386\fpu_helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-i386\helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-i386\int_helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-i386\mem_helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-i386\misc_helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-i386\mpx_helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-i386\seg_helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-i386\smm_helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-i386\svm_helper.c" />
-    <ClCompile Include="..\..\..\qemu\target-i386\translate.c" />
-    <ClCompile Include="..\..\..\qemu\target-i386\unicorn.c" />
+    <ClCompile Include="..\..\..\qemu\target\i386\arch_memory_mapping.c" />
+    <ClCompile Include="..\..\..\qemu\target\i386\bpt_helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\i386\cc_helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\i386\cpu.c" />
+    <ClCompile Include="..\..\..\qemu\target\i386\excp_helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\i386\fpu_helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\i386\helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\i386\int_helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\i386\mem_helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\i386\misc_helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\i386\mpx_helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\i386\seg_helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\i386\smm_helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\i386\svm_helper.c" />
+    <ClCompile Include="..\..\..\qemu\target\i386\translate.c" />
+    <ClCompile Include="..\..\..\qemu\target\i386\unicorn.c" />
     <ClCompile Include="..\..\..\qemu\tcg\i386\tcg-target.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -154,7 +154,7 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;__i386__;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;inline=__inline;__func__=__FUNCTION__;NEED_CPU_H;WIN32_LEAN_AND_MEAN</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target-i386;../../../include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target/i386;../../../include</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>x86_64.h</ForcedIncludeFiles>
       <AdditionalOptions>/wd4018 /wd4244 /wd4267 %(AdditionalOptions)</AdditionalOptions>
       <ExceptionHandling>false</ExceptionHandling>
@@ -175,7 +175,7 @@
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;__x86_64__;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;inline=__inline;__func__=__FUNCTION__;NEED_CPU_H;WIN32_LEAN_AND_MEAN</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target-i386;../../../include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target/i386;../../../include</AdditionalIncludeDirectories>
       <ForcedIncludeFiles>x86_64.h</ForcedIncludeFiles>
       <AdditionalOptions>/wd4018 /wd4244 /wd4267 %(AdditionalOptions)</AdditionalOptions>
       <ExceptionHandling>false</ExceptionHandling>
@@ -198,7 +198,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;__i386__;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;inline=__inline;__func__=__FUNCTION__;NEED_CPU_H;WIN32_LEAN_AND_MEAN</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target-i386;../../../include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target/i386;../../../include</AdditionalIncludeDirectories>
       <AdditionalOptions>/wd4018 /wd4244 /wd4267 %(AdditionalOptions)</AdditionalOptions>
       <ExceptionHandling>false</ExceptionHandling>
       <ForcedIncludeFiles>x86_64.h</ForcedIncludeFiles>
@@ -224,7 +224,7 @@
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;__x86_64__;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;inline=__inline;__func__=__FUNCTION__;NEED_CPU_H;WIN32_LEAN_AND_MEAN</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target-i386;../../../include</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target/i386;../../../include</AdditionalIncludeDirectories>
       <AdditionalOptions>/wd4018 /wd4244 /wd4267 %(AdditionalOptions)</AdditionalOptions>
       <ExceptionHandling>false</ExceptionHandling>
       <ForcedIncludeFiles>x86_64.h</ForcedIncludeFiles>
diff --git a/qemu/Makefile.target b/qemu/Makefile.target
index 6a1a47dd..83e46868 100644
--- a/qemu/Makefile.target
+++ b/qemu/Makefile.target
@@ -6,7 +6,7 @@ include config-devices.mak
 include $(SRC_PATH)/rules.mak
 
 $(call set-vpath, $(SRC_PATH))
-QEMU_CFLAGS += -I.. -I$(SRC_PATH)/target-$(TARGET_BASE_ARCH) -DNEED_CPU_H
+QEMU_CFLAGS += -I.. -I$(SRC_PATH)/target/$(TARGET_BASE_ARCH) -DNEED_CPU_H
 
 QEMU_CFLAGS+=-I$(SRC_PATH)/include
 
@@ -46,7 +46,7 @@ obj-y += cpu-exec-common.o
 obj-y += tcg/tcg.o tcg/tcg-op.o tcg/optimize.o
 obj-y += tcg/tcg-common.o
 obj-y += fpu/softfloat.o
-obj-y += target-$(TARGET_BASE_ARCH)/
+obj-y += target/$(TARGET_BASE_ARCH)/
 obj-y += tcg-runtime.o
 
 #########################################################
diff --git a/qemu/include/hw/arm/arm.h b/qemu/include/hw/arm/arm.h
index 627fa67b..27fb8af3 100644
--- a/qemu/include/hw/arm/arm.h
+++ b/qemu/include/hw/arm/arm.h
@@ -12,7 +12,7 @@
 #define HW_ARM_H
 
 #include "exec/memory.h"
-#include "target-arm/cpu-qom.h"
+#include "target/arm/cpu-qom.h"
 
 void tosa_machine_init(struct uc_struct *uc);
 void machvirt_machine_init(struct uc_struct *uc);   // ARM64
diff --git a/qemu/target-arm/Makefile.objs b/qemu/target/arm/Makefile.objs
similarity index 100%
rename from qemu/target-arm/Makefile.objs
rename to qemu/target/arm/Makefile.objs
diff --git a/qemu/target-arm/arm_ldst.h b/qemu/target/arm/arm_ldst.h
similarity index 100%
rename from qemu/target-arm/arm_ldst.h
rename to qemu/target/arm/arm_ldst.h
diff --git a/qemu/target-arm/cpu-qom.h b/qemu/target/arm/cpu-qom.h
similarity index 100%
rename from qemu/target-arm/cpu-qom.h
rename to qemu/target/arm/cpu-qom.h
diff --git a/qemu/target-arm/cpu.c b/qemu/target/arm/cpu.c
similarity index 100%
rename from qemu/target-arm/cpu.c
rename to qemu/target/arm/cpu.c
diff --git a/qemu/target-arm/cpu.h b/qemu/target/arm/cpu.h
similarity index 100%
rename from qemu/target-arm/cpu.h
rename to qemu/target/arm/cpu.h
diff --git a/qemu/target-arm/cpu64.c b/qemu/target/arm/cpu64.c
similarity index 100%
rename from qemu/target-arm/cpu64.c
rename to qemu/target/arm/cpu64.c
diff --git a/qemu/target-arm/crypto_helper.c b/qemu/target/arm/crypto_helper.c
similarity index 100%
rename from qemu/target-arm/crypto_helper.c
rename to qemu/target/arm/crypto_helper.c
diff --git a/qemu/target-arm/helper-a64.c b/qemu/target/arm/helper-a64.c
similarity index 100%
rename from qemu/target-arm/helper-a64.c
rename to qemu/target/arm/helper-a64.c
diff --git a/qemu/target-arm/helper-a64.h b/qemu/target/arm/helper-a64.h
similarity index 100%
rename from qemu/target-arm/helper-a64.h
rename to qemu/target/arm/helper-a64.h
diff --git a/qemu/target-arm/helper.c b/qemu/target/arm/helper.c
similarity index 100%
rename from qemu/target-arm/helper.c
rename to qemu/target/arm/helper.c
diff --git a/qemu/target-arm/helper.h b/qemu/target/arm/helper.h
similarity index 100%
rename from qemu/target-arm/helper.h
rename to qemu/target/arm/helper.h
diff --git a/qemu/target-arm/internals.h b/qemu/target/arm/internals.h
similarity index 99%
rename from qemu/target-arm/internals.h
rename to qemu/target/arm/internals.h
index 99df151a..e9da1da7 100644
--- a/qemu/target-arm/internals.h
+++ b/qemu/target/arm/internals.h
@@ -18,7 +18,7 @@
  * <http://www.gnu.org/licenses/gpl-2.0.html>
  *
  * This header defines functions, types, etc which need to be shared
- * between different source files within target-arm/ but which are
+ * between different source files within target/arm/ but which are
  * private to it and not required by the rest of QEMU.
  */
 
diff --git a/qemu/target-arm/iwmmxt_helper.c b/qemu/target/arm/iwmmxt_helper.c
similarity index 100%
rename from qemu/target-arm/iwmmxt_helper.c
rename to qemu/target/arm/iwmmxt_helper.c
diff --git a/qemu/target-arm/kvm-consts.h b/qemu/target/arm/kvm-consts.h
similarity index 100%
rename from qemu/target-arm/kvm-consts.h
rename to qemu/target/arm/kvm-consts.h
diff --git a/qemu/target-arm/neon_helper.c b/qemu/target/arm/neon_helper.c
similarity index 100%
rename from qemu/target-arm/neon_helper.c
rename to qemu/target/arm/neon_helper.c
diff --git a/qemu/target-arm/op_addsub.h b/qemu/target/arm/op_addsub.h
similarity index 100%
rename from qemu/target-arm/op_addsub.h
rename to qemu/target/arm/op_addsub.h
diff --git a/qemu/target-arm/op_helper.c b/qemu/target/arm/op_helper.c
similarity index 100%
rename from qemu/target-arm/op_helper.c
rename to qemu/target/arm/op_helper.c
diff --git a/qemu/target-arm/psci.c b/qemu/target/arm/psci.c
similarity index 100%
rename from qemu/target-arm/psci.c
rename to qemu/target/arm/psci.c
diff --git a/qemu/target-arm/translate-a64.c b/qemu/target/arm/translate-a64.c
similarity index 100%
rename from qemu/target-arm/translate-a64.c
rename to qemu/target/arm/translate-a64.c
diff --git a/qemu/target-arm/translate.c b/qemu/target/arm/translate.c
similarity index 100%
rename from qemu/target-arm/translate.c
rename to qemu/target/arm/translate.c
diff --git a/qemu/target-arm/translate.h b/qemu/target/arm/translate.h
similarity index 100%
rename from qemu/target-arm/translate.h
rename to qemu/target/arm/translate.h
diff --git a/qemu/target-arm/unicorn.h b/qemu/target/arm/unicorn.h
similarity index 100%
rename from qemu/target-arm/unicorn.h
rename to qemu/target/arm/unicorn.h
diff --git a/qemu/target-arm/unicorn_aarch64.c b/qemu/target/arm/unicorn_aarch64.c
similarity index 100%
rename from qemu/target-arm/unicorn_aarch64.c
rename to qemu/target/arm/unicorn_aarch64.c
diff --git a/qemu/target-arm/unicorn_arm.c b/qemu/target/arm/unicorn_arm.c
similarity index 100%
rename from qemu/target-arm/unicorn_arm.c
rename to qemu/target/arm/unicorn_arm.c
diff --git a/qemu/target-i386/Makefile.objs b/qemu/target/i386/Makefile.objs
similarity index 100%
rename from qemu/target-i386/Makefile.objs
rename to qemu/target/i386/Makefile.objs
diff --git a/qemu/target-i386/TODO b/qemu/target/i386/TODO
similarity index 100%
rename from qemu/target-i386/TODO
rename to qemu/target/i386/TODO
diff --git a/qemu/target-i386/arch_memory_mapping.c b/qemu/target/i386/arch_memory_mapping.c
similarity index 100%
rename from qemu/target-i386/arch_memory_mapping.c
rename to qemu/target/i386/arch_memory_mapping.c
diff --git a/qemu/target-i386/bpt_helper.c b/qemu/target/i386/bpt_helper.c
similarity index 100%
rename from qemu/target-i386/bpt_helper.c
rename to qemu/target/i386/bpt_helper.c
diff --git a/qemu/target-i386/cc_helper.c b/qemu/target/i386/cc_helper.c
similarity index 100%
rename from qemu/target-i386/cc_helper.c
rename to qemu/target/i386/cc_helper.c
diff --git a/qemu/target-i386/cc_helper_template.h b/qemu/target/i386/cc_helper_template.h
similarity index 100%
rename from qemu/target-i386/cc_helper_template.h
rename to qemu/target/i386/cc_helper_template.h
diff --git a/qemu/target-i386/cpu-qom.h b/qemu/target/i386/cpu-qom.h
similarity index 100%
rename from qemu/target-i386/cpu-qom.h
rename to qemu/target/i386/cpu-qom.h
diff --git a/qemu/target-i386/cpu.c b/qemu/target/i386/cpu.c
similarity index 100%
rename from qemu/target-i386/cpu.c
rename to qemu/target/i386/cpu.c
diff --git a/qemu/target-i386/cpu.h b/qemu/target/i386/cpu.h
similarity index 100%
rename from qemu/target-i386/cpu.h
rename to qemu/target/i386/cpu.h
diff --git a/qemu/target-i386/excp_helper.c b/qemu/target/i386/excp_helper.c
similarity index 100%
rename from qemu/target-i386/excp_helper.c
rename to qemu/target/i386/excp_helper.c
diff --git a/qemu/target-i386/fpu_helper.c b/qemu/target/i386/fpu_helper.c
similarity index 100%
rename from qemu/target-i386/fpu_helper.c
rename to qemu/target/i386/fpu_helper.c
diff --git a/qemu/target-i386/helper.c b/qemu/target/i386/helper.c
similarity index 100%
rename from qemu/target-i386/helper.c
rename to qemu/target/i386/helper.c
diff --git a/qemu/target-i386/helper.h b/qemu/target/i386/helper.h
similarity index 100%
rename from qemu/target-i386/helper.h
rename to qemu/target/i386/helper.h
diff --git a/qemu/target-i386/int_helper.c b/qemu/target/i386/int_helper.c
similarity index 100%
rename from qemu/target-i386/int_helper.c
rename to qemu/target/i386/int_helper.c
diff --git a/qemu/target-i386/mem_helper.c b/qemu/target/i386/mem_helper.c
similarity index 100%
rename from qemu/target-i386/mem_helper.c
rename to qemu/target/i386/mem_helper.c
diff --git a/qemu/target-i386/misc_helper.c b/qemu/target/i386/misc_helper.c
similarity index 100%
rename from qemu/target-i386/misc_helper.c
rename to qemu/target/i386/misc_helper.c
diff --git a/qemu/target-i386/mpx_helper.c b/qemu/target/i386/mpx_helper.c
similarity index 100%
rename from qemu/target-i386/mpx_helper.c
rename to qemu/target/i386/mpx_helper.c
diff --git a/qemu/target-i386/ops_sse.h b/qemu/target/i386/ops_sse.h
similarity index 100%
rename from qemu/target-i386/ops_sse.h
rename to qemu/target/i386/ops_sse.h
diff --git a/qemu/target-i386/ops_sse_header.h b/qemu/target/i386/ops_sse_header.h
similarity index 100%
rename from qemu/target-i386/ops_sse_header.h
rename to qemu/target/i386/ops_sse_header.h
diff --git a/qemu/target-i386/seg_helper.c b/qemu/target/i386/seg_helper.c
similarity index 100%
rename from qemu/target-i386/seg_helper.c
rename to qemu/target/i386/seg_helper.c
diff --git a/qemu/target-i386/shift_helper_template.h b/qemu/target/i386/shift_helper_template.h
similarity index 100%
rename from qemu/target-i386/shift_helper_template.h
rename to qemu/target/i386/shift_helper_template.h
diff --git a/qemu/target-i386/smm_helper.c b/qemu/target/i386/smm_helper.c
similarity index 100%
rename from qemu/target-i386/smm_helper.c
rename to qemu/target/i386/smm_helper.c
diff --git a/qemu/target-i386/svm.h b/qemu/target/i386/svm.h
similarity index 100%
rename from qemu/target-i386/svm.h
rename to qemu/target/i386/svm.h
diff --git a/qemu/target-i386/svm_helper.c b/qemu/target/i386/svm_helper.c
similarity index 100%
rename from qemu/target-i386/svm_helper.c
rename to qemu/target/i386/svm_helper.c
diff --git a/qemu/target-i386/topology.h b/qemu/target/i386/topology.h
similarity index 100%
rename from qemu/target-i386/topology.h
rename to qemu/target/i386/topology.h
diff --git a/qemu/target-i386/translate.c b/qemu/target/i386/translate.c
similarity index 100%
rename from qemu/target-i386/translate.c
rename to qemu/target/i386/translate.c
diff --git a/qemu/target-i386/unicorn.c b/qemu/target/i386/unicorn.c
similarity index 100%
rename from qemu/target-i386/unicorn.c
rename to qemu/target/i386/unicorn.c
diff --git a/qemu/target-i386/unicorn.h b/qemu/target/i386/unicorn.h
similarity index 100%
rename from qemu/target-i386/unicorn.h
rename to qemu/target/i386/unicorn.h
diff --git a/qemu/target-m68k/Makefile.objs b/qemu/target/m68k/Makefile.objs
similarity index 100%
rename from qemu/target-m68k/Makefile.objs
rename to qemu/target/m68k/Makefile.objs
diff --git a/qemu/target-m68k/cpu-qom.h b/qemu/target/m68k/cpu-qom.h
similarity index 100%
rename from qemu/target-m68k/cpu-qom.h
rename to qemu/target/m68k/cpu-qom.h
diff --git a/qemu/target-m68k/cpu.c b/qemu/target/m68k/cpu.c
similarity index 100%
rename from qemu/target-m68k/cpu.c
rename to qemu/target/m68k/cpu.c
diff --git a/qemu/target-m68k/cpu.h b/qemu/target/m68k/cpu.h
similarity index 100%
rename from qemu/target-m68k/cpu.h
rename to qemu/target/m68k/cpu.h
diff --git a/qemu/target-m68k/helper.c b/qemu/target/m68k/helper.c
similarity index 100%
rename from qemu/target-m68k/helper.c
rename to qemu/target/m68k/helper.c
diff --git a/qemu/target-m68k/helper.h b/qemu/target/m68k/helper.h
similarity index 100%
rename from qemu/target-m68k/helper.h
rename to qemu/target/m68k/helper.h
diff --git a/qemu/target-m68k/op_helper.c b/qemu/target/m68k/op_helper.c
similarity index 100%
rename from qemu/target-m68k/op_helper.c
rename to qemu/target/m68k/op_helper.c
diff --git a/qemu/target-m68k/qregs.def b/qemu/target/m68k/qregs.def
similarity index 100%
rename from qemu/target-m68k/qregs.def
rename to qemu/target/m68k/qregs.def
diff --git a/qemu/target-m68k/translate.c b/qemu/target/m68k/translate.c
similarity index 100%
rename from qemu/target-m68k/translate.c
rename to qemu/target/m68k/translate.c
diff --git a/qemu/target-m68k/unicorn.c b/qemu/target/m68k/unicorn.c
similarity index 100%
rename from qemu/target-m68k/unicorn.c
rename to qemu/target/m68k/unicorn.c
diff --git a/qemu/target-m68k/unicorn.h b/qemu/target/m68k/unicorn.h
similarity index 100%
rename from qemu/target-m68k/unicorn.h
rename to qemu/target/m68k/unicorn.h
diff --git a/qemu/target-mips/Makefile.objs b/qemu/target/mips/Makefile.objs
similarity index 100%
rename from qemu/target-mips/Makefile.objs
rename to qemu/target/mips/Makefile.objs
diff --git a/qemu/target-mips/TODO b/qemu/target/mips/TODO
similarity index 100%
rename from qemu/target-mips/TODO
rename to qemu/target/mips/TODO
diff --git a/qemu/target-mips/cpu-qom.h b/qemu/target/mips/cpu-qom.h
similarity index 100%
rename from qemu/target-mips/cpu-qom.h
rename to qemu/target/mips/cpu-qom.h
diff --git a/qemu/target-mips/cpu.c b/qemu/target/mips/cpu.c
similarity index 100%
rename from qemu/target-mips/cpu.c
rename to qemu/target/mips/cpu.c
diff --git a/qemu/target-mips/cpu.h b/qemu/target/mips/cpu.h
similarity index 100%
rename from qemu/target-mips/cpu.h
rename to qemu/target/mips/cpu.h
diff --git a/qemu/target-mips/dsp_helper.c b/qemu/target/mips/dsp_helper.c
similarity index 100%
rename from qemu/target-mips/dsp_helper.c
rename to qemu/target/mips/dsp_helper.c
diff --git a/qemu/target-mips/helper.c b/qemu/target/mips/helper.c
similarity index 100%
rename from qemu/target-mips/helper.c
rename to qemu/target/mips/helper.c
diff --git a/qemu/target-mips/helper.h b/qemu/target/mips/helper.h
similarity index 100%
rename from qemu/target-mips/helper.h
rename to qemu/target/mips/helper.h
diff --git a/qemu/target-mips/lmi_helper.c b/qemu/target/mips/lmi_helper.c
similarity index 100%
rename from qemu/target-mips/lmi_helper.c
rename to qemu/target/mips/lmi_helper.c
diff --git a/qemu/target-mips/mips-defs.h b/qemu/target/mips/mips-defs.h
similarity index 100%
rename from qemu/target-mips/mips-defs.h
rename to qemu/target/mips/mips-defs.h
diff --git a/qemu/target-mips/msa_helper.c b/qemu/target/mips/msa_helper.c
similarity index 100%
rename from qemu/target-mips/msa_helper.c
rename to qemu/target/mips/msa_helper.c
diff --git a/qemu/target-mips/op_helper.c b/qemu/target/mips/op_helper.c
similarity index 100%
rename from qemu/target-mips/op_helper.c
rename to qemu/target/mips/op_helper.c
diff --git a/qemu/target-mips/translate.c b/qemu/target/mips/translate.c
similarity index 100%
rename from qemu/target-mips/translate.c
rename to qemu/target/mips/translate.c
diff --git a/qemu/target-mips/translate_init.c b/qemu/target/mips/translate_init.c
similarity index 100%
rename from qemu/target-mips/translate_init.c
rename to qemu/target/mips/translate_init.c
diff --git a/qemu/target-mips/unicorn.c b/qemu/target/mips/unicorn.c
similarity index 100%
rename from qemu/target-mips/unicorn.c
rename to qemu/target/mips/unicorn.c
diff --git a/qemu/target-mips/unicorn.h b/qemu/target/mips/unicorn.h
similarity index 100%
rename from qemu/target-mips/unicorn.h
rename to qemu/target/mips/unicorn.h
diff --git a/qemu/target-sparc/Makefile.objs b/qemu/target/sparc/Makefile.objs
similarity index 100%
rename from qemu/target-sparc/Makefile.objs
rename to qemu/target/sparc/Makefile.objs
diff --git a/qemu/target-sparc/TODO b/qemu/target/sparc/TODO
similarity index 100%
rename from qemu/target-sparc/TODO
rename to qemu/target/sparc/TODO
diff --git a/qemu/target-sparc/asi.h b/qemu/target/sparc/asi.h
similarity index 100%
rename from qemu/target-sparc/asi.h
rename to qemu/target/sparc/asi.h
diff --git a/qemu/target-sparc/cc_helper.c b/qemu/target/sparc/cc_helper.c
similarity index 100%
rename from qemu/target-sparc/cc_helper.c
rename to qemu/target/sparc/cc_helper.c
diff --git a/qemu/target-sparc/cpu-qom.h b/qemu/target/sparc/cpu-qom.h
similarity index 100%
rename from qemu/target-sparc/cpu-qom.h
rename to qemu/target/sparc/cpu-qom.h
diff --git a/qemu/target-sparc/cpu.c b/qemu/target/sparc/cpu.c
similarity index 100%
rename from qemu/target-sparc/cpu.c
rename to qemu/target/sparc/cpu.c
diff --git a/qemu/target-sparc/cpu.h b/qemu/target/sparc/cpu.h
similarity index 100%
rename from qemu/target-sparc/cpu.h
rename to qemu/target/sparc/cpu.h
diff --git a/qemu/target-sparc/fop_helper.c b/qemu/target/sparc/fop_helper.c
similarity index 100%
rename from qemu/target-sparc/fop_helper.c
rename to qemu/target/sparc/fop_helper.c
diff --git a/qemu/target-sparc/helper.c b/qemu/target/sparc/helper.c
similarity index 100%
rename from qemu/target-sparc/helper.c
rename to qemu/target/sparc/helper.c
diff --git a/qemu/target-sparc/helper.h b/qemu/target/sparc/helper.h
similarity index 100%
rename from qemu/target-sparc/helper.h
rename to qemu/target/sparc/helper.h
diff --git a/qemu/target-sparc/int32_helper.c b/qemu/target/sparc/int32_helper.c
similarity index 100%
rename from qemu/target-sparc/int32_helper.c
rename to qemu/target/sparc/int32_helper.c
diff --git a/qemu/target-sparc/int64_helper.c b/qemu/target/sparc/int64_helper.c
similarity index 100%
rename from qemu/target-sparc/int64_helper.c
rename to qemu/target/sparc/int64_helper.c
diff --git a/qemu/target-sparc/ldst_helper.c b/qemu/target/sparc/ldst_helper.c
similarity index 100%
rename from qemu/target-sparc/ldst_helper.c
rename to qemu/target/sparc/ldst_helper.c
diff --git a/qemu/target-sparc/mmu_helper.c b/qemu/target/sparc/mmu_helper.c
similarity index 100%
rename from qemu/target-sparc/mmu_helper.c
rename to qemu/target/sparc/mmu_helper.c
diff --git a/qemu/target-sparc/translate.c b/qemu/target/sparc/translate.c
similarity index 100%
rename from qemu/target-sparc/translate.c
rename to qemu/target/sparc/translate.c
diff --git a/qemu/target-sparc/unicorn.c b/qemu/target/sparc/unicorn.c
similarity index 100%
rename from qemu/target-sparc/unicorn.c
rename to qemu/target/sparc/unicorn.c
diff --git a/qemu/target-sparc/unicorn.h b/qemu/target/sparc/unicorn.h
similarity index 100%
rename from qemu/target-sparc/unicorn.h
rename to qemu/target/sparc/unicorn.h
diff --git a/qemu/target-sparc/unicorn64.c b/qemu/target/sparc/unicorn64.c
similarity index 100%
rename from qemu/target-sparc/unicorn64.c
rename to qemu/target/sparc/unicorn64.c
diff --git a/qemu/target-sparc/vis_helper.c b/qemu/target/sparc/vis_helper.c
similarity index 100%
rename from qemu/target-sparc/vis_helper.c
rename to qemu/target/sparc/vis_helper.c
diff --git a/qemu/target-sparc/win_helper.c b/qemu/target/sparc/win_helper.c
similarity index 100%
rename from qemu/target-sparc/win_helper.c
rename to qemu/target/sparc/win_helper.c
diff --git a/uc.c b/uc.c
index 073c8696..fb1ef15c 100644
--- a/uc.c
+++ b/uc.c
@@ -16,11 +16,11 @@
 #include "uc_priv.h"
 
 // target specific headers
-#include "qemu/target-m68k/unicorn.h"
-#include "qemu/target-i386/unicorn.h"
-#include "qemu/target-arm/unicorn.h"
-#include "qemu/target-mips/unicorn.h"
-#include "qemu/target-sparc/unicorn.h"
+#include "qemu/target/arm/unicorn.h"
+#include "qemu/target/i386/unicorn.h"
+#include "qemu/target/m68k/unicorn.h"
+#include "qemu/target/mips/unicorn.h"
+#include "qemu/target/sparc/unicorn.h"
 
 #include "qemu/include/hw/boards.h"
 #include "qemu/include/qemu/queue.h"