diff --git a/arch/Makefile b/arch/Makefile
new file mode 100644
index 00000000000..826da53d109
--- /dev/null
+++ b/arch/Makefile
@@ -0,0 +1,6 @@
+ifeq (${ARCH},arm)
+obj-y += arm/
+endif
+ifeq (${ARCH},x86)
+obj-y += x86/
+endif
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
new file mode 100644
index 00000000000..b094d7759f5
--- /dev/null
+++ b/arch/arm/Makefile
@@ -0,0 +1,6 @@
+obj-y = core/
+obj-y += bsp/
+obj-y += timer/
+
+obj-$(CONFIG_BSP_FSL_FRDM_K64F) += fsl_frdm_k64f/
+obj-$(CONFIG_BSP_TI_LM3S6965) += ti_lm3s6965/
diff --git a/arch/arm/bsp/CortexM/Makefile b/arch/arm/bsp/CortexM/Makefile
new file mode 100644
index 00000000000..8443d12fd1e
--- /dev/null
+++ b/arch/arm/bsp/CortexM/Makefile
@@ -0,0 +1,15 @@
+EXTRA_CFLAGS +=-I $(srctree)/include/bsp
+EXTRA_CFLAGS +=-I $(srctree)/kernel/common/bsp
+EXTRA_CFLAGS +=-I $(srctree)/drivers
+
+ifeq (${CONFIG_BSP_FSL_FRDM_K64F},y)
+EXTRA_CFLAGS +=-I $(srctree)/arch/arm/fsl_frdm_k64f
+endif
+
+ifeq (${CONFIG_BSP_TI_LM3S6965},y)
+EXTRA_CFLAGS +=-I $(srctree)/arch/arm/ti_lm3s6965
+endif
+
+obj-y = vector_table.o reset.o \
+	prep_c.o scs.o scb.o
+obj-$(CONFIG_RUNTIME_NMI) += nmi.o
diff --git a/arch/arm/bsp/Makefile b/arch/arm/bsp/Makefile
new file mode 100644
index 00000000000..e7005a28ab8
--- /dev/null
+++ b/arch/arm/bsp/Makefile
@@ -0,0 +1,14 @@
+EXTRA_CFLAGS +=-I $(srctree)/include/bsp
+EXTRA_CFLAGS +=-I $(srctree)/kernel/common/bsp
+EXTRA_CFLAGS +=-I $(srctree)/drivers
+
+ifeq (${CONFIG_BSP_FSL_FRDM_K64F},y)
+EXTRA_CFLAGS +=-I $(srctree)/arch/arm/fsl_frdm_k64f
+endif
+
+ifeq (${CONFIG_BSP_TI_LM3S6965},y)
+EXTRA_CFLAGS +=-I $(srctree)/arch/arm/ti_lm3s6965
+endif
+
+obj-y = CortexM/
+obj-y += sysFatalErrorHandler.o rand32.o
diff --git a/arch/arm/core/Makefile b/arch/arm/core/Makefile
new file mode 100644
index 00000000000..df45888d115
--- /dev/null
+++ b/arch/arm/core/Makefile
@@ -0,0 +1,16 @@
+EXTRA_CFLAGS += -I$(srctree)/kernel/nanokernel/include
+EXTRA_CFLAGS += -I$(srctree)/kernel/microkernel/include
+EXTRA_CFLAGS += -I$(srctree)/target/src/bsp/arm
+
+EXTRA_AFLAGS := ${EXTRA_CFLAGS}
+
+obj-y = atomic.o exc_exit.o ffs.o irq_init.o \
+	nano_fiber_abort.o swap.o basepri.o \
+	fault.o gdb_stub_irq_vector_table.o \
+	irq_manage.o nanocontext.o cpu_idle.o \
+	fault_s.o gdb_stub.o isr_wrapper.o \
+	nanofatal.o
+
+obj-y += offsets/
+
+obj-$(MICROKERNEL) += task_abort.o
diff --git a/arch/arm/core/offsets/Makefile b/arch/arm/core/offsets/Makefile
new file mode 100644
index 00000000000..028c302aee3
--- /dev/null
+++ b/arch/arm/core/offsets/Makefile
@@ -0,0 +1 @@
+obj-y = offsets.o
diff --git a/arch/arm/fsl_frdm_k64f/Makefile b/arch/arm/fsl_frdm_k64f/Makefile
new file mode 100644
index 00000000000..7dc7abd27ff
--- /dev/null
+++ b/arch/arm/fsl_frdm_k64f/Makefile
@@ -0,0 +1,14 @@
+EXTRA_CFLAGS +=-I $(srctree)/include/bsp
+EXTRA_CFLAGS +=-I $(srctree)/kernel/common/bsp
+EXTRA_CFLAGS +=-I $(srctree)/drivers
+EXTRA_CFLAGS +=-I $(srctree)/arch/arm/fsl_frdm_k64f
+
+EXTRA_AFLAGS := ${EXTRA_CFLAGS}
+
+
+obj-y += system.o
+obj-y += nmi_on_reset.o
+obj-y += wdog.o
+
+obj-$(CONFIG_IRQ_VECTOR_TABLE_BSP) += irq_vector_table.o
+obj-$(CONFIG_SW_ISR_TABLE_BSP) += sw_isr_table.o
diff --git a/arch/arm/ti_lm3s6965/Makefile b/arch/arm/ti_lm3s6965/Makefile
new file mode 100644
index 00000000000..3b7175a1628
--- /dev/null
+++ b/arch/arm/ti_lm3s6965/Makefile
@@ -0,0 +1,14 @@
+EXTRA_CFLAGS +=-I $(srctree)/include/bsp
+EXTRA_CFLAGS +=-I $(srctree)/kernel/common/bsp
+EXTRA_CFLAGS +=-I $(srctree)/drivers
+EXTRA_CFLAGS +=-I $(srctree)/arch/arm/ti_lm3s6965
+
+EXTRA_AFLAGS := ${EXTRA_CFLAGS}
+
+
+obj-y += system.o
+obj-y += nmi_on_reset.o
+obj-y += scp.o
+
+obj-$(CONFIG_IRQ_VECTOR_TABLE_BSP) += irq_vector_table.o
+obj-$(CONFIG_SW_ISR_TABLE_BSP) += sw_isr_table.o
diff --git a/arch/arm/timer/Makefile b/arch/arm/timer/Makefile
new file mode 100644
index 00000000000..3ca508658d9
--- /dev/null
+++ b/arch/arm/timer/Makefile
@@ -0,0 +1,7 @@
+EXTRA_CFLAGS +=-I $(srctree)/include/bsp
+EXTRA_CFLAGS +=-I $(srctree)/kernel/common/bsp
+EXTRA_CFLAGS +=-I $(srctree)/drivers
+EXTRA_CFLAGS +=-I $(srctree)/arch/arm/fsl_frdm_k64f
+
+obj-y = systick.o
+obj-$(CONFIG_GDB_INFO) += systick_gdb.o
diff --git a/arch/x86/Makefile b/arch/x86/Makefile
new file mode 100644
index 00000000000..438a0050ca2
--- /dev/null
+++ b/arch/x86/Makefile
@@ -0,0 +1,8 @@
+obj-y = core/
+obj-y += bsp/
+obj-y += timer/
+obj-y += interrupt_controller/
+
+obj-$(CONFIG_MICROKERNEL) += task/
+obj-$(CONFIG_BSP_QUARK) += quark/
+obj-$(CONFIG_BSP_GENERIC_PC) += generic_pc/
diff --git a/arch/x86/bsp/Makefile b/arch/x86/bsp/Makefile
new file mode 100644
index 00000000000..6f3906ae753
--- /dev/null
+++ b/arch/x86/bsp/Makefile
@@ -0,0 +1,19 @@
+ifeq (${CONFIG_BSP_GENERIC_PC},y)
+EXTRA_CFLAGS +=-I$(srctree)/arch/x86/generic_pc
+endif
+
+ifeq (${CONFIG_BSP_QUARK},y)
+EXTRA_CFLAGS +=-I$(srctree)/arch/x86/quark
+endif
+
+obj-y = crt0.o sysFatalErrorHandler.o driver_static_irq_stubs.o
+
+ifneq ($(CONFIG_CLFLUSH_INSTRUCTION_SUPPORTED),y)
+obj-y += cache_s.o
+endif
+
+obj-$(CONFIG_LOAPIC) += systemApic.o
+obj-$(CONFIG_CLFLUSH_INSTRUCTION_SUPPORTED) += cache.o
+obj-$(CONFIG_PIC) += systemPic.o
+obj-$(CONFIG_PIC) += i8259Boi.o
+obj-$(CONFIG_TEST_RANDOM_GENERATOR) += rand32.o
diff --git a/arch/x86/core/Makefile b/arch/x86/core/Makefile
new file mode 100644
index 00000000000..6de221d8ed3
--- /dev/null
+++ b/arch/x86/core/Makefile
@@ -0,0 +1,19 @@
+EXTRA_CFLAGS += -I$(srctree)/kernel/nanokernel/include
+EXTRA_CFLAGS += -I$(srctree)/kernel/microkernel/include
+
+obj-y = gdt.o nanocontext.o nanofatal.o cpuhalt.o \
+	excstub.o swap.o ffs.o intboiexit.o msr.o \
+	excconnect.o inthndlset.o
+
+ifeq ($(CONFIG_LOCK_INSTRUCTION_UNSUPPORTED),y)
+obj-y += nanoatomic_nolock.o
+else
+obj-y += nanoatomic.o
+endif
+
+obj-$(CONFIG_FP_SHARING) += nanofloat.o
+obj-$(CONFIG_UNALIGNED_WRITE_UNSUPPORTED) += unaligned.o
+
+ifneq ($(CONFIG_NO_ISRS),y)
+obj-y += intconnect.o intstub.o
+endif
diff --git a/arch/x86/core/offsets/Makefile b/arch/x86/core/offsets/Makefile
new file mode 100644
index 00000000000..028c302aee3
--- /dev/null
+++ b/arch/x86/core/offsets/Makefile
@@ -0,0 +1 @@
+obj-y = offsets.o
diff --git a/arch/x86/generic_pc/Makefile b/arch/x86/generic_pc/Makefile
new file mode 100644
index 00000000000..b53cd3cc8e9
--- /dev/null
+++ b/arch/x86/generic_pc/Makefile
@@ -0,0 +1,5 @@
+EXTRA_CFLAGS +=-I$(srctree)/arch/x86
+EXTRA_CFLAGS +=-I$(srctree)/drivers
+EXTRA_AFLAGS := ${EXTRA_CFLAGS}
+
+obj-y = system.o
diff --git a/arch/x86/interrupt_controller/Makefile b/arch/x86/interrupt_controller/Makefile
new file mode 100644
index 00000000000..cfdb275a1ba
--- /dev/null
+++ b/arch/x86/interrupt_controller/Makefile
@@ -0,0 +1,6 @@
+EXTRA_CFLAGS +=-I$(srctree)/drivers
+EXTRA_CFLAGS +=-I$(srctree)/arch/x86/generic_pc
+EXTRA_CFLAGS +=-I$(srctree)/arch/x86
+
+obj-$(CONFIG_LOAPIC) += loApicIntr.o
+obj-$(CONFIG_IOAPIC) += ioApicIntr.o
diff --git a/arch/x86/quark/Makefile b/arch/x86/quark/Makefile
new file mode 100644
index 00000000000..ff413133e82
--- /dev/null
+++ b/arch/x86/quark/Makefile
@@ -0,0 +1,7 @@
+EXTRA_CFLAGS += -I$(srctree)/include/bsp
+EXTRA_CFLAGS += -I$(srctree)/kernel/common/bsp
+EXTRA_CFLAGS += -I$(srctree)/drivers
+
+EXTRA_AFLAGS := ${EXTRA_CFLAGS}
+
+obj-y = system.o
diff --git a/arch/x86/task/Makefile b/arch/x86/task/Makefile
new file mode 100644
index 00000000000..17966e3f71a
--- /dev/null
+++ b/arch/x86/task/Makefile
@@ -0,0 +1,4 @@
+EXTRA_CFLAGS +=-I$(srctree)/kernel/microkernel/include
+EXTRA_AFLAGS := ${EXTRA_CFLAGS}
+
+obj-y = strtask.o
diff --git a/arch/x86/timer/Makefile b/arch/x86/timer/Makefile
new file mode 100644
index 00000000000..cdbce5fdbe8
--- /dev/null
+++ b/arch/x86/timer/Makefile
@@ -0,0 +1,6 @@
+EXTRA_CFLAGS +=-I$(srctree)/drivers
+EXTRA_CFLAGS +=-I$(srctree)/arch/x86/generic_pc
+EXTRA_CFLAGS +=-I$(srctree)/arch/x86
+
+obj-$(CONFIG_HPET_TIMER) += hpet.o
+obj-$(CONFIG_LOAPIC_TIMER) += loApicTimer.o