diff --git a/Makefile.target b/Makefile.target
index 53cd64c..8dafe97 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -68,17 +68,17 @@
     core/qdev.c \
     core/sysbus.c \
     dma.c \
-    goldfish_audio.c \
-    goldfish_device.c \
-    goldfish_events_device.c \
-    goldfish_fb.c \
-    goldfish_battery.c \
-    goldfish_mmc.c   \
-    goldfish_memlog.c \
-    goldfish_nand.c \
-    goldfish_pipe.c \
-    goldfish_tty.c \
-    goldfish_vmem.c \
+    android/goldfish/audio.c \
+    android/goldfish/device.c \
+    android/goldfish/events_device.c \
+    android/goldfish/fb.c \
+    android/goldfish/battery.c \
+    android/goldfish/mmc.c   \
+    android/goldfish/memlog.c \
+    android/goldfish/nand.c \
+    android/goldfish/pipe.c \
+    android/goldfish/tty.c \
+    android/goldfish/vmem.c \
     msmouse.c \
     pci.c \
     scsi-disk.c \
@@ -95,10 +95,10 @@
     android_arm.c \
     arm/pic.c \
     arm/boot.c \
-    goldfish_interrupt.c \
-    goldfish_switch.c \
-    goldfish_timer.c \
-    goldfish_trace.c \
+    android/goldfish/interrupt.c \
+    android/goldfish/switch.c \
+    android/goldfish/timer.c \
+    android/goldfish/trace.c \
 
 # The following sources must be compiled with the final executables
 # because they contain device_init() or machine_init() statements.
@@ -141,10 +141,10 @@
 HW_SOURCES += \
     android_mips.c \
     mips_pic.c \
-    goldfish_interrupt.c \
-    goldfish_switch.c \
-    goldfish_timer.c \
-    goldfish_trace.c \
+    android/goldfish/interrupt.c \
+    android/goldfish/switch.c \
+    android/goldfish/timer.c \
+    android/goldfish/trace.c \
     mips_timer.c \
     mips_int.c
 
diff --git a/android/main.c b/android/main.c
index ffa42aa..591e250 100644
--- a/android/main.c
+++ b/android/main.c
@@ -45,7 +45,7 @@
 
 #include "android/main-common.h"
 #include "android/help.h"
-#include "hw/goldfish_nand.h"
+#include "hw/android/goldfish/nand.h"
 
 #include "android/globals.h"
 
diff --git a/hw/goldfish_audio.c b/hw/android/goldfish/audio.c
similarity index 100%
rename from hw/goldfish_audio.c
rename to hw/android/goldfish/audio.c
diff --git a/hw/goldfish_battery.c b/hw/android/goldfish/battery.c
similarity index 100%
rename from hw/goldfish_battery.c
rename to hw/android/goldfish/battery.c
diff --git a/hw/goldfish_device.c b/hw/android/goldfish/device.c
similarity index 100%
rename from hw/goldfish_device.c
rename to hw/android/goldfish/device.c
diff --git a/hw/goldfish_events_device.c b/hw/android/goldfish/events_device.c
similarity index 100%
rename from hw/goldfish_events_device.c
rename to hw/android/goldfish/events_device.c
diff --git a/hw/goldfish_fb.c b/hw/android/goldfish/fb.c
similarity index 100%
rename from hw/goldfish_fb.c
rename to hw/android/goldfish/fb.c
diff --git a/hw/goldfish_interrupt.c b/hw/android/goldfish/interrupt.c
similarity index 100%
rename from hw/goldfish_interrupt.c
rename to hw/android/goldfish/interrupt.c
diff --git a/hw/goldfish_memlog.c b/hw/android/goldfish/memlog.c
similarity index 100%
rename from hw/goldfish_memlog.c
rename to hw/android/goldfish/memlog.c
diff --git a/hw/goldfish_mmc.c b/hw/android/goldfish/mmc.c
similarity index 100%
rename from hw/goldfish_mmc.c
rename to hw/android/goldfish/mmc.c
diff --git a/hw/goldfish_nand.c b/hw/android/goldfish/nand.c
similarity index 99%
rename from hw/goldfish_nand.c
rename to hw/android/goldfish/nand.c
index fc4edcb..9b40729 100644
--- a/hw/goldfish_nand.c
+++ b/hw/android/goldfish/nand.c
@@ -10,8 +10,8 @@
 ** GNU General Public License for more details.
 */
 #include "migration/qemu-file.h"
-#include "goldfish_nand_reg.h"
-#include "goldfish_nand.h"
+#include "nand_reg.h"
+#include "hw/android/goldfish/nand.h"
 #include "hw/android/goldfish/vmem.h"
 #include "android/utils/tempfile.h"
 #include "android/qemu-debug.h"
diff --git a/hw/goldfish_nand_reg.h b/hw/android/goldfish/nand_reg.h
similarity index 100%
rename from hw/goldfish_nand_reg.h
rename to hw/android/goldfish/nand_reg.h
diff --git a/hw/goldfish_pipe.c b/hw/android/goldfish/pipe.c
similarity index 100%
rename from hw/goldfish_pipe.c
rename to hw/android/goldfish/pipe.c
diff --git a/hw/goldfish_switch.c b/hw/android/goldfish/switch.c
similarity index 100%
rename from hw/goldfish_switch.c
rename to hw/android/goldfish/switch.c
diff --git a/hw/goldfish_timer.c b/hw/android/goldfish/timer.c
similarity index 100%
rename from hw/goldfish_timer.c
rename to hw/android/goldfish/timer.c
diff --git a/hw/goldfish_trace.c b/hw/android/goldfish/trace.c
similarity index 100%
rename from hw/goldfish_trace.c
rename to hw/android/goldfish/trace.c
diff --git a/hw/goldfish_tty.c b/hw/android/goldfish/tty.c
similarity index 100%
rename from hw/goldfish_tty.c
rename to hw/android/goldfish/tty.c
diff --git a/hw/goldfish_vmem.c b/hw/android/goldfish/vmem.c
similarity index 100%
rename from hw/goldfish_vmem.c
rename to hw/android/goldfish/vmem.c
diff --git a/hw/goldfish_nand.h b/include/hw/android/goldfish/nand.h
similarity index 100%
rename from hw/goldfish_nand.h
rename to include/hw/android/goldfish/nand.h
diff --git a/vl-android.c b/vl-android.c
index 446ac06..84c4154 100644
--- a/vl-android.c
+++ b/vl-android.c
@@ -36,7 +36,7 @@
 #include "hw/audiodev.h"
 #include "hw/isa/isa.h"
 #include "hw/baum.h"
-#include "hw/goldfish_nand.h"
+#include "hw/android/goldfish/nand.h"
 #include "net/net.h"
 #include "ui/console.h"
 #include "sysemu/sysemu.h"