diff --git a/Makefile b/Makefile
index 570a1a632..8fea6124a 100644
--- a/Makefile
+++ b/Makefile
@@ -50,21 +50,22 @@ LIBS += -lz
 LIBS += -luuid
 
 # hw
+SRCS += hw/block_if.c
+SRCS += hw/usb_core.c
+SRCS += hw/uart_core.c
 SRCS += hw/pci/virtio/virtio.c
 SRCS += hw/pci/virtio/virtio_kernel.c
 SRCS += hw/platform/usb_mouse.c
-SRCS += hw/platform/usb_core.c
 SRCS += hw/platform/atkbdc.c
 SRCS += hw/platform/ps2mouse.c
 SRCS += hw/platform/rtc.c
 SRCS += hw/platform/ps2kbd.c
-SRCS += hw/platform/pm.c
-SRCS += hw/platform/uart_core.c
-SRCS += hw/platform/block_if.c
 SRCS += hw/platform/ioapic.c
 SRCS += hw/platform/cmos_io.c
 SRCS += hw/platform/ioc.c
 SRCS += hw/platform/ioc_cbc.c
+SRCS += hw/platform/acpi/acpi.c
+SRCS += hw/platform/acpi/acpi_pm.c
 SRCS += hw/pci/wdt_i6300esb.c
 SRCS += hw/pci/lpc.c
 SRCS += hw/pci/xhci.c
@@ -81,8 +82,6 @@ SRCS += hw/pci/virtio/virtio_hyper_dmabuf.c
 SRCS += hw/pci/virtio/virtio_heci.c
 SRCS += hw/pci/irq.c
 SRCS += hw/pci/uart.c
-SRCS += hw/acpi/acpi.c
-SRCS += hw/acpi/acpi_pm.c
 
 # core
 #SRCS += core/bootrom.c
@@ -103,6 +102,10 @@ SRCS += core/mptbl.c
 SRCS += core/main.c
 SRCS += core/hugetlb.c
 
+# arch
+SRCS += arch/x86/pm.c
+
+
 OBJS := $(patsubst %.c,$(DM_OBJDIR)/%.o,$(SRCS))
 
 HEADERS := $(shell find $(BASEDIR) -name '*.h')
diff --git a/hw/platform/pm.c b/arch/x86/pm.c
similarity index 100%
rename from hw/platform/pm.c
rename to arch/x86/pm.c
diff --git a/hw/platform/block_if.c b/hw/block_if.c
similarity index 100%
rename from hw/platform/block_if.c
rename to hw/block_if.c
diff --git a/hw/acpi/acpi.c b/hw/platform/acpi/acpi.c
similarity index 100%
rename from hw/acpi/acpi.c
rename to hw/platform/acpi/acpi.c
diff --git a/hw/acpi/acpi_pm.c b/hw/platform/acpi/acpi_pm.c
similarity index 100%
rename from hw/acpi/acpi_pm.c
rename to hw/platform/acpi/acpi_pm.c
diff --git a/hw/platform/uart_core.c b/hw/uart_core.c
similarity index 100%
rename from hw/platform/uart_core.c
rename to hw/uart_core.c
diff --git a/hw/platform/usb_core.c b/hw/usb_core.c
similarity index 100%
rename from hw/platform/usb_core.c
rename to hw/usb_core.c