diff --git a/Makefile b/Makefile
index 0e2629d..d40dea4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,11 @@
-MODULES=debug audio chnnlsv clockgen codec ctrl exceptionman ge init interruptman \
-iofilemgr led libatrac3plus loadcore loadexec mediaman me_wrapper modulemgr \
-syscon sysmem systimer usersystemlib wlanfirm
+ROOT_DIR = $(PWD)
+
+export ROOT_DIR
+
+MODULES=debug syscon \
+kd/audio kd/chnnlsv kd/clockgen kd/codec kd/ctrl kd/exceptionman kd/ge kd/init kd/interruptman \
+kd/iofilemgr kd/led kd/libatrac3plus kd/loadcore kd/loadexec kd/mediaman kd/me_wrapper kd/modulemgr \
+kd/sysmem kd/systimer kd/usersystemlib kd/wlanfirm
 
 all: $(MODULES)
 
diff --git a/lib/build.mak b/lib/build.mak
index 080350b..fb12726 100644
--- a/lib/build.mak
+++ b/lib/build.mak
@@ -1,9 +1,9 @@
 # Copyright (C) 2011, 2012 The uOFW team
 # See the file COPYING for copying permission.
 
-include ../../lib/common.mak
+include $(ROOT_DIR)/lib/common.mak
 
-INCLUDE = -I../../include
+INCLUDE = -I$(ROOT_DIR)/include
 WARNINGS = -Wall -Wextra -Werror -Wno-pragmas
 
 # Only keep builtins for memcpy, memset for their inline function
@@ -39,11 +39,11 @@ BUILTINS_DISABLE = -fno-builtin-bcmp \
 
 CFLAGS := $(INCLUDE) -O1 -fno-toplevel-reorder -G0 $(WARNINGS) $(BUILTINS_DISABLE)
 CFLAGS_S := $(INCLUDE)
-LDFLAGS := -L../../lib -specs=../../lib/prxspecs -Wl,-q,-T../../lib/linkfile.prx
+LDFLAGS := -L$(ROOT_DIR)/lib -specs=$(ROOT_DIR)/lib/prxspecs -Wl,-q,-T$(ROOT_DIR)/lib/linkfile.prx
 
-FIXUP_IMPORTS = ../../utils/fixup-imports/psp-fixup-imports
-BUILD_EXPORTS = ../../utils/build-exports/psp-build-exports
-PRXGEN = ../../utils/kprxgen/psp-kprxgen
+FIXUP_IMPORTS = $(ROOT_DIR)/utils/fixup-imports/psp-fixup-imports
+BUILD_EXPORTS = $(ROOT_DIR)/utils/build-exports/psp-build-exports
+PRXGEN = $(ROOT_DIR)/utils/kprxgen/psp-kprxgen
 
 PRX_EXPORTS = exports.exp
 EXPORT_OBJ=$(patsubst %.exp,%.o,$(PRX_EXPORTS))
@@ -87,7 +87,7 @@ clean:
 rebuild: clean all
 
 Makefile.exp: $(PRX_EXPORTS)
-	cat ../../lib/build_stubs.mak > Makefile.exp
+	cat $(ROOT_DIR)/lib/build_stubs.mak > Makefile.exp
 	$(BUILD_EXPORTS) -k $< >> Makefile.exp
 
 exp: Makefile.exp
diff --git a/src/amctrl/exports.exp b/src/kd/amctrl/exports.exp
similarity index 100%
rename from src/amctrl/exports.exp
rename to src/kd/amctrl/exports.exp
diff --git a/src/audio/Makefile b/src/kd/audio/Makefile
similarity index 91%
rename from src/audio/Makefile
rename to src/kd/audio/Makefile
index 7f40df9..7e0560e 100644
--- a/src/audio/Makefile
+++ b/src/kd/audio/Makefile
@@ -8,5 +8,5 @@ DEBUG = 0
 
 LIBS = -lsceCodec_driver -lInterruptManagerForKernel -lSysclibForKernel -lThreadManForKernel -lsceSysEventForKernel -lSysMemForKernel -lDmacManForKernel -lsceDdr_driver -lsceSysreg_driver -lsceClockgen_driver -lUtilsForKernel
 
-include ../../lib/build.mak
+include $(ROOT_DIR)/lib/build.mak
 
diff --git a/src/audio/audio.c b/src/kd/audio/audio.c
similarity index 100%
rename from src/audio/audio.c
rename to src/kd/audio/audio.c
diff --git a/src/audio/exports.exp b/src/kd/audio/exports.exp
similarity index 100%
rename from src/audio/exports.exp
rename to src/kd/audio/exports.exp
diff --git a/src/avcodec/audiocodec.c b/src/kd/avcodec/audiocodec.c
similarity index 100%
rename from src/avcodec/audiocodec.c
rename to src/kd/avcodec/audiocodec.c
diff --git a/src/avcodec/exports.exp b/src/kd/avcodec/exports.exp
similarity index 100%
rename from src/avcodec/exports.exp
rename to src/kd/avcodec/exports.exp
diff --git a/src/chkreg/exports.exp b/src/kd/chkreg/exports.exp
similarity index 100%
rename from src/chkreg/exports.exp
rename to src/kd/chkreg/exports.exp
diff --git a/src/chnnlsv/Makefile b/src/kd/chnnlsv/Makefile
similarity index 84%
rename from src/chnnlsv/Makefile
rename to src/kd/chnnlsv/Makefile
index fb2cc03..8648b46 100644
--- a/src/chnnlsv/Makefile
+++ b/src/kd/chnnlsv/Makefile
@@ -8,4 +8,4 @@ OBJS = chnnlsv.o
 
 LIBS = -lThreadManForKernel -lpspsemaphore
 
-include ../../lib/build.mak
+include $(ROOT_DIR)/lib/build.mak
diff --git a/src/chnnlsv/chnnlsv.c b/src/kd/chnnlsv/chnnlsv.c
similarity index 100%
rename from src/chnnlsv/chnnlsv.c
rename to src/kd/chnnlsv/chnnlsv.c
diff --git a/src/chnnlsv/chnnlsv.h b/src/kd/chnnlsv/chnnlsv.h
similarity index 100%
rename from src/chnnlsv/chnnlsv.h
rename to src/kd/chnnlsv/chnnlsv.h
diff --git a/src/chnnlsv/exports.exp b/src/kd/chnnlsv/exports.exp
similarity index 100%
rename from src/chnnlsv/exports.exp
rename to src/kd/chnnlsv/exports.exp
diff --git a/src/clockgen/Makefile b/src/kd/clockgen/Makefile
similarity index 86%
rename from src/clockgen/Makefile
rename to src/kd/clockgen/Makefile
index 91df2d4..00f9573 100644
--- a/src/clockgen/Makefile
+++ b/src/kd/clockgen/Makefile
@@ -8,4 +8,4 @@ OBJS = clockgen.o
 
 LIBS = -lThreadManForUser -lsceSysEventForKernel -lsceI2c_driver
 
-include ../../lib/build.mak
+include $(ROOT_DIR)/lib/build.mak
diff --git a/src/clockgen/clockgen.c b/src/kd/clockgen/clockgen.c
similarity index 100%
rename from src/clockgen/clockgen.c
rename to src/kd/clockgen/clockgen.c
diff --git a/src/clockgen/clockgen_int.h b/src/kd/clockgen/clockgen_int.h
similarity index 100%
rename from src/clockgen/clockgen_int.h
rename to src/kd/clockgen/clockgen_int.h
diff --git a/src/clockgen/exports.exp b/src/kd/clockgen/exports.exp
similarity index 100%
rename from src/clockgen/exports.exp
rename to src/kd/clockgen/exports.exp
diff --git a/src/codec/Makefile b/src/kd/codec/Makefile
similarity index 86%
rename from src/codec/Makefile
rename to src/kd/codec/Makefile
index 0d7f765..54ffa21 100644
--- a/src/codec/Makefile
+++ b/src/kd/codec/Makefile
@@ -6,5 +6,5 @@ OBJS = codec.o
 
 LIBS = -lThreadManForKernel -lsceSysEventForKernel -lsceI2c_driver -lsceSysreg_driver -lsceGpio_driver
 
-include ../../lib/build.mak
+include $(ROOT_DIR)/lib/build.mak
 
diff --git a/src/codec/codec.c b/src/kd/codec/codec.c
similarity index 100%
rename from src/codec/codec.c
rename to src/kd/codec/codec.c
diff --git a/src/codec/exports.exp b/src/kd/codec/exports.exp
similarity index 100%
rename from src/codec/exports.exp
rename to src/kd/codec/exports.exp
diff --git a/src/ctrl/Makefile b/src/kd/ctrl/Makefile
similarity index 91%
rename from src/ctrl/Makefile
rename to src/kd/ctrl/Makefile
index cc228a7..9599003 100644
--- a/src/ctrl/Makefile
+++ b/src/kd/ctrl/Makefile
@@ -8,5 +8,5 @@ LIBS = -lSysMemForKernel -lsceSuspendForKernel -lsceSysEventForKernel -lKDebugFo
        -lSysclibForKernel -lThreadManForKernel -lSysTimerForKernel -lInitForKernel -lsceDisplay_driver \
        -lsceSyscon_driver
 
-include ../../lib/build.mak
+include $(ROOT_DIR)/lib/build.mak
 
diff --git a/src/ctrl/ctrl.c b/src/kd/ctrl/ctrl.c
similarity index 100%
rename from src/ctrl/ctrl.c
rename to src/kd/ctrl/ctrl.c
diff --git a/src/ctrl/exports.exp b/src/kd/ctrl/exports.exp
similarity index 100%
rename from src/ctrl/exports.exp
rename to src/kd/ctrl/exports.exp
diff --git a/src/display/exports.exp b/src/kd/display/exports.exp
similarity index 100%
rename from src/display/exports.exp
rename to src/kd/display/exports.exp
diff --git a/src/dmacman/Makefile b/src/kd/dmacman/Makefile
similarity index 78%
rename from src/dmacman/Makefile
rename to src/kd/dmacman/Makefile
index 836fc3b..30b84e6 100644
--- a/src/dmacman/Makefile
+++ b/src/kd/dmacman/Makefile
@@ -4,4 +4,4 @@
 TARGET = dmacman
 OBJS = dmacman.o
 
-include ../../lib/build.mak
\ No newline at end of file
+include $(ROOT_DIR)/lib/build.mak
\ No newline at end of file
diff --git a/src/dmacman/dmacman.c b/src/kd/dmacman/dmacman.c
similarity index 100%
rename from src/dmacman/dmacman.c
rename to src/kd/dmacman/dmacman.c
diff --git a/src/dmacman/exports.exp b/src/kd/dmacman/exports.exp
similarity index 100%
rename from src/dmacman/exports.exp
rename to src/kd/dmacman/exports.exp
diff --git a/src/exceptionman/Makefile b/src/kd/exceptionman/Makefile
similarity index 81%
rename from src/exceptionman/Makefile
rename to src/kd/exceptionman/Makefile
index b18844c..7dd3b03 100644
--- a/src/exceptionman/Makefile
+++ b/src/kd/exceptionman/Makefile
@@ -4,5 +4,5 @@
 TARGET = exceptionman
 OBJS = excep.o exceptions.o intr.o nmi.o
 
-include ../../lib/build.mak
+include $(ROOT_DIR)/lib/build.mak
 
diff --git a/src/exceptionman/excep.S b/src/kd/exceptionman/excep.S
similarity index 100%
rename from src/exceptionman/excep.S
rename to src/kd/exceptionman/excep.S
diff --git a/src/exceptionman/excep.h b/src/kd/exceptionman/excep.h
similarity index 100%
rename from src/exceptionman/excep.h
rename to src/kd/exceptionman/excep.h
diff --git a/src/exceptionman/exceptions.c b/src/kd/exceptionman/exceptions.c
similarity index 100%
rename from src/exceptionman/exceptions.c
rename to src/kd/exceptionman/exceptions.c
diff --git a/src/exceptionman/exceptions.h b/src/kd/exceptionman/exceptions.h
similarity index 100%
rename from src/exceptionman/exceptions.h
rename to src/kd/exceptionman/exceptions.h
diff --git a/src/exceptionman/exports.exp b/src/kd/exceptionman/exports.exp
similarity index 100%
rename from src/exceptionman/exports.exp
rename to src/kd/exceptionman/exports.exp
diff --git a/src/exceptionman/intr.S b/src/kd/exceptionman/intr.S
similarity index 100%
rename from src/exceptionman/intr.S
rename to src/kd/exceptionman/intr.S
diff --git a/src/exceptionman/intr.h b/src/kd/exceptionman/intr.h
similarity index 100%
rename from src/exceptionman/intr.h
rename to src/kd/exceptionman/intr.h
diff --git a/src/exceptionman/nmi.c b/src/kd/exceptionman/nmi.c
similarity index 100%
rename from src/exceptionman/nmi.c
rename to src/kd/exceptionman/nmi.c
diff --git a/src/exceptionman/nmi.h b/src/kd/exceptionman/nmi.h
similarity index 100%
rename from src/exceptionman/nmi.h
rename to src/kd/exceptionman/nmi.h
diff --git a/src/ge/Makefile b/src/kd/ge/Makefile
similarity index 90%
rename from src/ge/Makefile
rename to src/kd/ge/Makefile
index ae2ba65..1484dea 100644
--- a/src/ge/Makefile
+++ b/src/kd/ge/Makefile
@@ -8,5 +8,5 @@ DEBUG = 0
 
 LIBS = -lInterruptManagerForKernel -lThreadManForKernel -lsceSysreg_driver -lKDebugForKernel -lUtilsForKernel -lsceSysEventForKernel -lSysMemForKernel -lSysclibForKernel -lInitForKernel
 
-include ../../lib/build.mak
+include $(ROOT_DIR)/lib/build.mak
 
diff --git a/src/ge/exports.exp b/src/kd/ge/exports.exp
similarity index 100%
rename from src/ge/exports.exp
rename to src/kd/ge/exports.exp
diff --git a/src/ge/ge.c b/src/kd/ge/ge.c
similarity index 100%
rename from src/ge/ge.c
rename to src/kd/ge/ge.c
diff --git a/src/ge/ge_int.h b/src/kd/ge/ge_int.h
similarity index 100%
rename from src/ge/ge_int.h
rename to src/kd/ge/ge_int.h
diff --git a/src/ge/stall.S b/src/kd/ge/stall.S
similarity index 100%
rename from src/ge/stall.S
rename to src/kd/ge/stall.S
diff --git a/src/http_storage/Makefile b/src/kd/http_storage/Makefile
similarity index 88%
rename from src/http_storage/Makefile
rename to src/kd/http_storage/Makefile
index c4cc2b8..003c986 100644
--- a/src/http_storage/Makefile
+++ b/src/kd/http_storage/Makefile
@@ -8,4 +8,4 @@ OBJS = http_storage.o
 
 LIBS = -lSysMemForKernel -lSysclibForKernel -lIoFileMgrForKernel -lModuleMgrForKernel -lsceChkreg_driver
 
-include ../../lib/build.mak
\ No newline at end of file
+include $(ROOT_DIR)/lib/build.mak
\ No newline at end of file
diff --git a/src/http_storage/exports.exp b/src/kd/http_storage/exports.exp
similarity index 100%
rename from src/http_storage/exports.exp
rename to src/kd/http_storage/exports.exp
diff --git a/src/http_storage/http_storage.c b/src/kd/http_storage/http_storage.c
similarity index 100%
rename from src/http_storage/http_storage.c
rename to src/kd/http_storage/http_storage.c
diff --git a/src/idstorage/Makefile b/src/kd/idstorage/Makefile
similarity index 91%
rename from src/idstorage/Makefile
rename to src/kd/idstorage/Makefile
index 8cf4b76..f26c861 100644
--- a/src/idstorage/Makefile
+++ b/src/kd/idstorage/Makefile
@@ -10,4 +10,4 @@ LIBS = -lKDebugForKernel -lsceSuspendForKernel -lsceSysEventForKernel \
     -lInterruptManagerForKernel -lSysclibForKernel -lThreadManForKernel \
     -lUtilsForKernel -lsceSysreg_driver -lsceNand_driver
 
-include ../../lib/build.mak
+include $(ROOT_DIR)/lib/build.mak
diff --git a/src/idstorage/exports.exp b/src/kd/idstorage/exports.exp
similarity index 100%
rename from src/idstorage/exports.exp
rename to src/kd/idstorage/exports.exp
diff --git a/src/idstorage/idstorage.c b/src/kd/idstorage/idstorage.c
similarity index 100%
rename from src/idstorage/idstorage.c
rename to src/kd/idstorage/idstorage.c
diff --git a/src/idstorage/idstorage_int.h b/src/kd/idstorage/idstorage_int.h
similarity index 100%
rename from src/idstorage/idstorage_int.h
rename to src/kd/idstorage/idstorage_int.h
diff --git a/src/init/Makefile b/src/kd/init/Makefile
similarity index 93%
rename from src/init/Makefile
rename to src/kd/init/Makefile
index 90ce3c1..ac97c55 100644
--- a/src/init/Makefile
+++ b/src/kd/init/Makefile
@@ -12,5 +12,5 @@ LIBS = -lSysMemForKernel -lsceSuspendForKernel -lKDebugForKernel -lInterruptMana
        -lSysclibForKernel -lThreadManForKernel -lInitForKernel -lStdioForKernel -lIoFileMgrForUser \
        -lModuleMgrForKernel -lModuleMgrForUser -lUtilsForKernel -lLoadCoreForKernel -lLoadExecForKernel
 
-include ../../lib/build.mak
+include $(ROOT_DIR)/lib/build.mak
 
diff --git a/src/init/exports.exp b/src/kd/init/exports.exp
similarity index 100%
rename from src/init/exports.exp
rename to src/kd/init/exports.exp
diff --git a/src/init/gamePatching.c b/src/kd/init/gamePatching.c
similarity index 100%
rename from src/init/gamePatching.c
rename to src/kd/init/gamePatching.c
diff --git a/src/init/gamePatching.h b/src/kd/init/gamePatching.h
similarity index 100%
rename from src/init/gamePatching.h
rename to src/kd/init/gamePatching.h
diff --git a/src/init/init.c b/src/kd/init/init.c
similarity index 100%
rename from src/init/init.c
rename to src/kd/init/init.c
diff --git a/src/init/init_asm.S b/src/kd/init/init_asm.S
similarity index 95%
rename from src/init/init_asm.S
rename to src/kd/init/init_asm.S
index ea5b4f1..c59d03c 100644
--- a/src/init/init_asm.S
+++ b/src/kd/init/init_asm.S
@@ -1,7 +1,7 @@
 # Copyright (C) 2011, 2012, 2013 The uOFW team
 # See the file COPYING for copying permission.
 
-#include "../../include/common_asm.h"
+#include "common_asm.h"
 
     .text
 
diff --git a/src/init/init_int.h b/src/kd/init/init_int.h
similarity index 100%
rename from src/init/init_int.h
rename to src/kd/init/init_int.h
diff --git a/src/init/libcUtils.c b/src/kd/init/libcUtils.c
similarity index 100%
rename from src/init/libcUtils.c
rename to src/kd/init/libcUtils.c
diff --git a/src/init/libcUtils.h b/src/kd/init/libcUtils.h
similarity index 100%
rename from src/init/libcUtils.h
rename to src/kd/init/libcUtils.h
diff --git a/src/init/patch.S b/src/kd/init/patch.S
similarity index 100%
rename from src/init/patch.S
rename to src/kd/init/patch.S
diff --git a/src/init/patch.h b/src/kd/init/patch.h
similarity index 100%
rename from src/init/patch.h
rename to src/kd/init/patch.h
diff --git a/src/interruptman/Makefile b/src/kd/interruptman/Makefile
similarity index 88%
rename from src/interruptman/Makefile
rename to src/kd/interruptman/Makefile
index b242595..7088287 100644
--- a/src/interruptman/Makefile
+++ b/src/kd/interruptman/Makefile
@@ -8,5 +8,5 @@ OBJS = start.o interruptman.o end.o
 
 LIBS = -lExceptionManagerForKernel -lLoadCoreForKernel -lSysMemForKernel -lsceSuspendForKernel
 
-include ../../lib/build.mak
+include $(ROOT_DIR)/lib/build.mak
 
diff --git a/src/interruptman/end.S b/src/kd/interruptman/end.S
similarity index 100%
rename from src/interruptman/end.S
rename to src/kd/interruptman/end.S
diff --git a/src/interruptman/exports.exp b/src/kd/interruptman/exports.exp
similarity index 100%
rename from src/interruptman/exports.exp
rename to src/kd/interruptman/exports.exp
diff --git a/src/interruptman/interruptman.c b/src/kd/interruptman/interruptman.c
similarity index 100%
rename from src/interruptman/interruptman.c
rename to src/kd/interruptman/interruptman.c
diff --git a/src/interruptman/interruptman.h b/src/kd/interruptman/interruptman.h
similarity index 100%
rename from src/interruptman/interruptman.h
rename to src/kd/interruptman/interruptman.h
diff --git a/src/interruptman/start.S b/src/kd/interruptman/start.S
similarity index 100%
rename from src/interruptman/start.S
rename to src/kd/interruptman/start.S
diff --git a/src/interruptman/start.h b/src/kd/interruptman/start.h
similarity index 100%
rename from src/interruptman/start.h
rename to src/kd/interruptman/start.h
diff --git a/src/iofilemgr/Makefile b/src/kd/iofilemgr/Makefile
similarity index 89%
rename from src/iofilemgr/Makefile
rename to src/kd/iofilemgr/Makefile
index c4bec72..e9353b7 100644
--- a/src/iofilemgr/Makefile
+++ b/src/kd/iofilemgr/Makefile
@@ -8,5 +8,5 @@ DEBUG = 1
 
 LIBS = -lThreadManForKernel -lSysclibForKernel -lSysMemForKernel -lKDebugForKernel -lInterruptManagerForKernel -lsceSuspendForKernel
 
-include ../../lib/build.mak
+include $(ROOT_DIR)/lib/build.mak
 
diff --git a/src/iofilemgr/exports.exp b/src/kd/iofilemgr/exports.exp
similarity index 100%
rename from src/iofilemgr/exports.exp
rename to src/kd/iofilemgr/exports.exp
diff --git a/src/iofilemgr/iofilemgr.c b/src/kd/iofilemgr/iofilemgr.c
similarity index 100%
rename from src/iofilemgr/iofilemgr.c
rename to src/kd/iofilemgr/iofilemgr.c
diff --git a/src/iofilemgr/stdio.c b/src/kd/iofilemgr/stdio.c
similarity index 100%
rename from src/iofilemgr/stdio.c
rename to src/kd/iofilemgr/stdio.c
diff --git a/src/led/Makefile b/src/kd/led/Makefile
similarity index 89%
rename from src/led/Makefile
rename to src/kd/led/Makefile
index e2de5e6..9e9bd59 100644
--- a/src/led/Makefile
+++ b/src/kd/led/Makefile
@@ -8,5 +8,5 @@ LIBS = -lSysMemForKernel -lsceSuspendForKernel -lsceSysEventForKernel -lSysclibF
        -lsceGpio_driver -lInterruptManager
        
 
-include ../../lib/build.mak
+include $(ROOT_DIR)/lib/build.mak
 
diff --git a/src/led/exports.exp b/src/kd/led/exports.exp
similarity index 100%
rename from src/led/exports.exp
rename to src/kd/led/exports.exp
diff --git a/src/led/led.c b/src/kd/led/led.c
similarity index 100%
rename from src/led/led.c
rename to src/kd/led/led.c
diff --git a/src/lfatfs/exports.exp b/src/kd/lfatfs/exports.exp
similarity index 100%
rename from src/lfatfs/exports.exp
rename to src/kd/lfatfs/exports.exp
diff --git a/src/libaac/Makefile b/src/kd/libaac/Makefile
similarity index 85%
rename from src/libaac/Makefile
rename to src/kd/libaac/Makefile
index 992e264..d75fa74 100644
--- a/src/libaac/Makefile
+++ b/src/kd/libaac/Makefile
@@ -8,4 +8,4 @@ OBJS = libaac.o
 
 LIBS = -lKernel_Library -lThreadManForUser -lsceAudiocodec
 
-include ../../lib/build.mak
+include $(ROOT_DIR)/lib/build.mak
diff --git a/src/libaac/exports.exp b/src/kd/libaac/exports.exp
similarity index 100%
rename from src/libaac/exports.exp
rename to src/kd/libaac/exports.exp
diff --git a/src/libaac/libaac.c b/src/kd/libaac/libaac.c
similarity index 100%
rename from src/libaac/libaac.c
rename to src/kd/libaac/libaac.c
diff --git a/src/libatrac3plus/Makefile b/src/kd/libatrac3plus/Makefile
similarity index 84%
rename from src/libatrac3plus/Makefile
rename to src/kd/libatrac3plus/Makefile
index aeaf5fa..2e4bc8a 100644
--- a/src/libatrac3plus/Makefile
+++ b/src/kd/libatrac3plus/Makefile
@@ -8,5 +8,5 @@ OBJS = libatrac3plus.o
 
 LIBS = -lKernel_Library -lsceAudiocodec
 
-include ../../lib/build.mak
+include $(ROOT_DIR)/lib/build.mak
 
diff --git a/src/libatrac3plus/exports.exp b/src/kd/libatrac3plus/exports.exp
similarity index 100%
rename from src/libatrac3plus/exports.exp
rename to src/kd/libatrac3plus/exports.exp
diff --git a/src/libatrac3plus/libatrac3plus.c b/src/kd/libatrac3plus/libatrac3plus.c
similarity index 100%
rename from src/libatrac3plus/libatrac3plus.c
rename to src/kd/libatrac3plus/libatrac3plus.c
diff --git a/src/libatrac3plus/libatrac3plus.h b/src/kd/libatrac3plus/libatrac3plus.h
similarity index 100%
rename from src/libatrac3plus/libatrac3plus.h
rename to src/kd/libatrac3plus/libatrac3plus.h
diff --git a/src/loadcore/Makefile b/src/kd/loadcore/Makefile
similarity index 90%
rename from src/loadcore/Makefile
rename to src/kd/loadcore/Makefile
index 7be2d58..ec2d8ed 100644
--- a/src/loadcore/Makefile
+++ b/src/kd/loadcore/Makefile
@@ -6,5 +6,5 @@ OBJS = cache.o clibUtils.o hash.o interruptController.o loadcore.o loadcore_asm.
 
 LIBS = -lSysMemForKernel -lKDebugForKernel -lUtilsForKernel -lInterruptManagerForKernel -lmemlmd -lsceMesgLed_driver
 
-include ../../lib/build.mak
+include $(ROOT_DIR)/lib/build.mak
 
diff --git a/src/loadcore/cache.S b/src/kd/loadcore/cache.S
similarity index 96%
rename from src/loadcore/cache.S
rename to src/kd/loadcore/cache.S
index fdbf437..829a32d 100644
--- a/src/loadcore/cache.S
+++ b/src/kd/loadcore/cache.S
@@ -1,7 +1,7 @@
 # Copyright (C) 2011, 2012, 2013 The uOFW team
 # See the file COPYING for copying permission.
 
-#include "../../include/common_asm.h"
+#include "common_asm.h"
 
     .text
 
diff --git a/src/loadcore/cache.h b/src/kd/loadcore/cache.h
similarity index 100%
rename from src/loadcore/cache.h
rename to src/kd/loadcore/cache.h
diff --git a/src/loadcore/clibUtils.c b/src/kd/loadcore/clibUtils.c
similarity index 100%
rename from src/loadcore/clibUtils.c
rename to src/kd/loadcore/clibUtils.c
diff --git a/src/loadcore/clibUtils.h b/src/kd/loadcore/clibUtils.h
similarity index 100%
rename from src/loadcore/clibUtils.h
rename to src/kd/loadcore/clibUtils.h
diff --git a/src/loadcore/elf.h b/src/kd/loadcore/elf.h
similarity index 100%
rename from src/loadcore/elf.h
rename to src/kd/loadcore/elf.h
diff --git a/src/loadcore/exports.exp b/src/kd/loadcore/exports.exp
similarity index 100%
rename from src/loadcore/exports.exp
rename to src/kd/loadcore/exports.exp
diff --git a/src/loadcore/hash.c b/src/kd/loadcore/hash.c
similarity index 100%
rename from src/loadcore/hash.c
rename to src/kd/loadcore/hash.c
diff --git a/src/loadcore/hash.h b/src/kd/loadcore/hash.h
similarity index 100%
rename from src/loadcore/hash.h
rename to src/kd/loadcore/hash.h
diff --git a/src/loadcore/interruptController.S b/src/kd/loadcore/interruptController.S
similarity index 95%
rename from src/loadcore/interruptController.S
rename to src/kd/loadcore/interruptController.S
index 3785b89..6b4bdc8 100644
--- a/src/loadcore/interruptController.S
+++ b/src/kd/loadcore/interruptController.S
@@ -1,7 +1,7 @@
 # Copyright (C) 2011, 2012, 2013 The uOFW team
 # See the file COPYING for copying permission.
 
-#include "../../include/common_asm.h"
+#include "common_asm.h"
 
     .text
 
diff --git a/src/loadcore/interruptController.h b/src/kd/loadcore/interruptController.h
similarity index 100%
rename from src/loadcore/interruptController.h
rename to src/kd/loadcore/interruptController.h
diff --git a/src/loadcore/loadcore.c b/src/kd/loadcore/loadcore.c
similarity index 100%
rename from src/loadcore/loadcore.c
rename to src/kd/loadcore/loadcore.c
diff --git a/src/loadcore/loadcore_asm.S b/src/kd/loadcore/loadcore_asm.S
similarity index 98%
rename from src/loadcore/loadcore_asm.S
rename to src/kd/loadcore/loadcore_asm.S
index 0646247..da468be 100644
--- a/src/loadcore/loadcore_asm.S
+++ b/src/kd/loadcore/loadcore_asm.S
@@ -1,7 +1,7 @@
 # Copyright (C) 2011, 2012, 2013 The uOFW team
 # See the file COPYING for copying permission.
 
-#include "../../include/common_asm.h"
+#include "common_asm.h"
 
     .text
 
diff --git a/src/loadcore/loadcore_int.h b/src/kd/loadcore/loadcore_int.h
similarity index 100%
rename from src/loadcore/loadcore_int.h
rename to src/kd/loadcore/loadcore_int.h
diff --git a/src/loadcore/loadelf.c b/src/kd/loadcore/loadelf.c
similarity index 100%
rename from src/loadcore/loadelf.c
rename to src/kd/loadcore/loadelf.c
diff --git a/src/loadcore/loadelf.h b/src/kd/loadcore/loadelf.h
similarity index 100%
rename from src/loadcore/loadelf.h
rename to src/kd/loadcore/loadelf.h
diff --git a/src/loadcore/module.c b/src/kd/loadcore/module.c
similarity index 100%
rename from src/loadcore/module.c
rename to src/kd/loadcore/module.c
diff --git a/src/loadcore/module.h b/src/kd/loadcore/module.h
similarity index 100%
rename from src/loadcore/module.h
rename to src/kd/loadcore/module.h
diff --git a/src/loadcore/nid.h b/src/kd/loadcore/nid.h
similarity index 100%
rename from src/loadcore/nid.h
rename to src/kd/loadcore/nid.h
diff --git a/src/loadcore/systable.c b/src/kd/loadcore/systable.c
similarity index 100%
rename from src/loadcore/systable.c
rename to src/kd/loadcore/systable.c
diff --git a/src/loadcore/systable.h b/src/kd/loadcore/systable.h
similarity index 100%
rename from src/loadcore/systable.h
rename to src/kd/loadcore/systable.h
diff --git a/src/loadexec/Makefile b/src/kd/loadexec/Makefile
similarity index 92%
rename from src/loadexec/Makefile
rename to src/kd/loadexec/Makefile
index 8b8ec87..15457b3 100644
--- a/src/loadexec/Makefile
+++ b/src/kd/loadexec/Makefile
@@ -10,5 +10,5 @@ INSTALLER = 1
 
 LIBS = -lSysMemForKernel -lsceSuspendForKernel -lKDebugForKernel -lLoadCoreForKernel -lInterruptManagerForKernel -lSysclibForKernel -lThreadManForKernel -lIoFileMgrForKernel -lModuleMgrForKernel -lInitForKernel -lUtilsForKernel
 
-include ../../lib/build.mak
+include $(ROOT_DIR)/lib/build.mak
 
diff --git a/src/loadexec/exports.exp b/src/kd/loadexec/exports.exp
similarity index 100%
rename from src/loadexec/exports.exp
rename to src/kd/loadexec/exports.exp
diff --git a/src/loadexec/kl4e.S b/src/kd/loadexec/kl4e.S
similarity index 100%
rename from src/loadexec/kl4e.S
rename to src/kd/loadexec/kl4e.S
diff --git a/src/loadexec/loadexec.c b/src/kd/loadexec/loadexec.c
similarity index 100%
rename from src/loadexec/loadexec.c
rename to src/kd/loadexec/loadexec.c
diff --git a/src/loadexec/loadexec_int.h b/src/kd/loadexec/loadexec_int.h
similarity index 100%
rename from src/loadexec/loadexec_int.h
rename to src/kd/loadexec/loadexec_int.h
diff --git a/src/loadexec/patch.S b/src/kd/loadexec/patch.S
similarity index 100%
rename from src/loadexec/patch.S
rename to src/kd/loadexec/patch.S
diff --git a/src/loadexec/patch.h b/src/kd/loadexec/patch.h
similarity index 100%
rename from src/loadexec/patch.h
rename to src/kd/loadexec/patch.h
diff --git a/src/loadexec/reboot.h b/src/kd/loadexec/reboot.h
similarity index 100%
rename from src/loadexec/reboot.h
rename to src/kd/loadexec/reboot.h
diff --git a/src/lowio/exports.exp b/src/kd/lowio/exports.exp
similarity index 100%
rename from src/lowio/exports.exp
rename to src/kd/lowio/exports.exp
diff --git a/src/lowio/gpio.c b/src/kd/lowio/gpio.c
similarity index 100%
rename from src/lowio/gpio.c
rename to src/kd/lowio/gpio.c
diff --git a/src/lowio/lcdc.c b/src/kd/lowio/lcdc.c
similarity index 100%
rename from src/lowio/lcdc.c
rename to src/kd/lowio/lcdc.c
diff --git a/src/lowio/lcdc.h b/src/kd/lowio/lcdc.h
similarity index 100%
rename from src/lowio/lcdc.h
rename to src/kd/lowio/lcdc.h
diff --git a/src/lowio/nand.c b/src/kd/lowio/nand.c
similarity index 100%
rename from src/lowio/nand.c
rename to src/kd/lowio/nand.c
diff --git a/src/lowio/sysreg_driver.c b/src/kd/lowio/sysreg_driver.c
similarity index 100%
rename from src/lowio/sysreg_driver.c
rename to src/kd/lowio/sysreg_driver.c
diff --git a/src/mcctrl/mcctrl.c b/src/kd/mcctrl/mcctrl.c
similarity index 100%
rename from src/mcctrl/mcctrl.c
rename to src/kd/mcctrl/mcctrl.c
diff --git a/src/me_wrapper/Makefile b/src/kd/me_wrapper/Makefile
similarity index 91%
rename from src/me_wrapper/Makefile
rename to src/kd/me_wrapper/Makefile
index ad5332d..28cd929 100644
--- a/src/me_wrapper/Makefile
+++ b/src/kd/me_wrapper/Makefile
@@ -6,5 +6,5 @@ OBJS = init.o me_wrapper.o
 
 LIBS = -lsceSysreg_driver -lUtilsForKernel -lIoFileMgrForKernel -lsceSysEventForKernel -lSysclibForKernel -lSysMemForKernel -lInterruptManagerForKernel -lThreadManForKernel -lsceDdr_driver -lsceSyscon_driver -lsceLFatFs_driver -lsceWmd_driver
 
-include ../../lib/build.mak
+include $(ROOT_DIR)/lib/build.mak
 
diff --git a/src/me_wrapper/exports.exp b/src/kd/me_wrapper/exports.exp
similarity index 100%
rename from src/me_wrapper/exports.exp
rename to src/kd/me_wrapper/exports.exp
diff --git a/src/me_wrapper/init.S b/src/kd/me_wrapper/init.S
similarity index 100%
rename from src/me_wrapper/init.S
rename to src/kd/me_wrapper/init.S
diff --git a/src/me_wrapper/me_wrapper.c b/src/kd/me_wrapper/me_wrapper.c
similarity index 100%
rename from src/me_wrapper/me_wrapper.c
rename to src/kd/me_wrapper/me_wrapper.c
diff --git a/src/me_wrapper/me_wrapper.h b/src/kd/me_wrapper/me_wrapper.h
similarity index 100%
rename from src/me_wrapper/me_wrapper.h
rename to src/kd/me_wrapper/me_wrapper.h
diff --git a/src/mediaman/Makefile b/src/kd/mediaman/Makefile
similarity index 88%
rename from src/mediaman/Makefile
rename to src/kd/mediaman/Makefile
index 6672ef3..ffb39d8 100644
--- a/src/mediaman/Makefile
+++ b/src/kd/mediaman/Makefile
@@ -7,4 +7,4 @@ OBJS = mediaman.o
 LIBS = -lInterruptManagerForKernel -lIoFileMgrForKernel -lSysclibForKernel -lSysMemForKernel \
        -lThreadManForKernel
 
-include ../../lib/build.mak
\ No newline at end of file
+include $(ROOT_DIR)/lib/build.mak
\ No newline at end of file
diff --git a/src/mediaman/exports.exp b/src/kd/mediaman/exports.exp
similarity index 100%
rename from src/mediaman/exports.exp
rename to src/kd/mediaman/exports.exp
diff --git a/src/mediaman/mediaman.c b/src/kd/mediaman/mediaman.c
similarity index 100%
rename from src/mediaman/mediaman.c
rename to src/kd/mediaman/mediaman.c
diff --git a/src/memlmd/exports.exp b/src/kd/memlmd/exports.exp
similarity index 100%
rename from src/memlmd/exports.exp
rename to src/kd/memlmd/exports.exp
diff --git a/src/memlmd/memlmd.c b/src/kd/memlmd/memlmd.c
similarity index 100%
rename from src/memlmd/memlmd.c
rename to src/kd/memlmd/memlmd.c
diff --git a/src/memlmd/memlmd_02.c b/src/kd/memlmd/memlmd_02.c
similarity index 100%
rename from src/memlmd/memlmd_02.c
rename to src/kd/memlmd/memlmd_02.c
diff --git a/src/mesg_led/exports.exp b/src/kd/mesg_led/exports.exp
similarity index 100%
rename from src/mesg_led/exports.exp
rename to src/kd/mesg_led/exports.exp
diff --git a/src/mesg_led/mesg_led.c b/src/kd/mesg_led/mesg_led.c
similarity index 100%
rename from src/mesg_led/mesg_led.c
rename to src/kd/mesg_led/mesg_led.c
diff --git a/src/mlnbridge_msapp/Makefile b/src/kd/mlnbridge_msapp/Makefile
similarity index 88%
rename from src/mlnbridge_msapp/Makefile
rename to src/kd/mlnbridge_msapp/Makefile
index debeb88..21d734e 100644
--- a/src/mlnbridge_msapp/Makefile
+++ b/src/kd/mlnbridge_msapp/Makefile
@@ -6,4 +6,4 @@ OBJS = mlnbridge_msapp.o
 
 LIBS = -lModuleMgrForKernel -lSysclibForKernel -lSysMemForKernel -lsceRtc_driver -lsceReg_driver -lsceDve_driver  
 
-include ../../lib/build.mak
\ No newline at end of file
+include $(ROOT_DIR)/lib/build.mak
\ No newline at end of file
diff --git a/src/mlnbridge_msapp/exports.exp b/src/kd/mlnbridge_msapp/exports.exp
similarity index 100%
rename from src/mlnbridge_msapp/exports.exp
rename to src/kd/mlnbridge_msapp/exports.exp
diff --git a/src/mlnbridge_msapp/mlnbridge_msapp.c b/src/kd/mlnbridge_msapp/mlnbridge_msapp.c
similarity index 100%
rename from src/mlnbridge_msapp/mlnbridge_msapp.c
rename to src/kd/mlnbridge_msapp/mlnbridge_msapp.c
diff --git a/src/modulemgr/Makefile b/src/kd/modulemgr/Makefile
similarity index 92%
rename from src/modulemgr/Makefile
rename to src/kd/modulemgr/Makefile
index 5e00410..eb737da 100644
--- a/src/modulemgr/Makefile
+++ b/src/kd/modulemgr/Makefile
@@ -7,5 +7,5 @@ OBJS = chunk.o init.o loadModule.o modulemgr.o override.o queryModule.o rebootMo
 LIBS = -lSysMemForKernel -lKDebugForKernel -lInterruptManagerForKernel -lUtilsForKernel \
        -lSysclibForKernel -lThreadManForKernel -lIoFileMgrForKernel -lLoadCoreForKernel
 
-include ../../lib/build.mak
+include $(ROOT_DIR)/lib/build.mak
 
diff --git a/src/modulemgr/chunk.c b/src/kd/modulemgr/chunk.c
similarity index 100%
rename from src/modulemgr/chunk.c
rename to src/kd/modulemgr/chunk.c
diff --git a/src/modulemgr/exports.exp b/src/kd/modulemgr/exports.exp
similarity index 100%
rename from src/modulemgr/exports.exp
rename to src/kd/modulemgr/exports.exp
diff --git a/src/modulemgr/init.c b/src/kd/modulemgr/init.c
similarity index 100%
rename from src/modulemgr/init.c
rename to src/kd/modulemgr/init.c
diff --git a/src/modulemgr/loadModule.c b/src/kd/modulemgr/loadModule.c
similarity index 100%
rename from src/modulemgr/loadModule.c
rename to src/kd/modulemgr/loadModule.c
diff --git a/src/modulemgr/loadModuleChecks_inline.h b/src/kd/modulemgr/loadModuleChecks_inline.h
similarity index 100%
rename from src/modulemgr/loadModuleChecks_inline.h
rename to src/kd/modulemgr/loadModuleChecks_inline.h
diff --git a/src/modulemgr/modulemgr.c b/src/kd/modulemgr/modulemgr.c
similarity index 100%
rename from src/modulemgr/modulemgr.c
rename to src/kd/modulemgr/modulemgr.c
diff --git a/src/modulemgr/modulemgr_int.h b/src/kd/modulemgr/modulemgr_int.h
similarity index 100%
rename from src/modulemgr/modulemgr_int.h
rename to src/kd/modulemgr/modulemgr_int.h
diff --git a/src/modulemgr/override.c b/src/kd/modulemgr/override.c
similarity index 100%
rename from src/modulemgr/override.c
rename to src/kd/modulemgr/override.c
diff --git a/src/modulemgr/override.h b/src/kd/modulemgr/override.h
similarity index 100%
rename from src/modulemgr/override.h
rename to src/kd/modulemgr/override.h
diff --git a/src/modulemgr/pbp.h b/src/kd/modulemgr/pbp.h
similarity index 100%
rename from src/modulemgr/pbp.h
rename to src/kd/modulemgr/pbp.h
diff --git a/src/modulemgr/queryModule.c b/src/kd/modulemgr/queryModule.c
similarity index 100%
rename from src/modulemgr/queryModule.c
rename to src/kd/modulemgr/queryModule.c
diff --git a/src/modulemgr/rebootModule.c b/src/kd/modulemgr/rebootModule.c
similarity index 100%
rename from src/modulemgr/rebootModule.c
rename to src/kd/modulemgr/rebootModule.c
diff --git a/src/modulemgr/start-stopModule.c b/src/kd/modulemgr/start-stopModule.c
similarity index 100%
rename from src/modulemgr/start-stopModule.c
rename to src/kd/modulemgr/start-stopModule.c
diff --git a/src/np_core/Makefile b/src/kd/np_core/Makefile
similarity index 86%
rename from src/np_core/Makefile
rename to src/kd/np_core/Makefile
index 4190195..9e85bd9 100644
--- a/src/np_core/Makefile
+++ b/src/kd/np_core/Makefile
@@ -8,4 +8,4 @@ OBJS = np_core.o
 
 LIBS = -lSysMemForKernel -lSysclibForKernel -lsceOpenPSID_driver
 
-include ../../lib/build.mak
\ No newline at end of file
+include $(ROOT_DIR)/lib/build.mak
\ No newline at end of file
diff --git a/src/np_core/exports.exp b/src/kd/np_core/exports.exp
similarity index 100%
rename from src/np_core/exports.exp
rename to src/kd/np_core/exports.exp
diff --git a/src/np_core/np_core.c b/src/kd/np_core/np_core.c
similarity index 100%
rename from src/np_core/np_core.c
rename to src/kd/np_core/np_core.c
diff --git a/src/np_inst/Makefile b/src/kd/np_inst/Makefile
similarity index 89%
rename from src/np_inst/Makefile
rename to src/kd/np_inst/Makefile
index 62d0e28..7124f26 100644
--- a/src/np_inst/Makefile
+++ b/src/kd/np_inst/Makefile
@@ -6,4 +6,4 @@ OBJS = np_inst.o
 #DEBUG = 1
 
 LIBS = -lThreadManForKernel -lSysclibForKernel -lIoFileMgrForKernel -lscePspNpDrm_driver -lscePcact_driver -lsceRtc_driver -lsceOpenPSID_driver
-include ../../lib/build.mak
\ No newline at end of file
+include $(ROOT_DIR)/lib/build.mak
\ No newline at end of file
diff --git a/src/np_inst/exports.exp b/src/kd/np_inst/exports.exp
similarity index 100%
rename from src/np_inst/exports.exp
rename to src/kd/np_inst/exports.exp
diff --git a/src/np_inst/np_inst.c b/src/kd/np_inst/np_inst.c
similarity index 100%
rename from src/np_inst/np_inst.c
rename to src/kd/np_inst/np_inst.c
diff --git a/src/npdrm/exports.exp b/src/kd/npdrm/exports.exp
similarity index 100%
rename from src/npdrm/exports.exp
rename to src/kd/npdrm/exports.exp
diff --git a/src/openpsid/ddrdb.c b/src/kd/openpsid/ddrdb.c
similarity index 100%
rename from src/openpsid/ddrdb.c
rename to src/kd/openpsid/ddrdb.c
diff --git a/src/openpsid/exports.exp b/src/kd/openpsid/exports.exp
similarity index 100%
rename from src/openpsid/exports.exp
rename to src/kd/openpsid/exports.exp
diff --git a/src/psheet/Makefile b/src/kd/psheet/Makefile
similarity index 79%
rename from src/psheet/Makefile
rename to src/kd/psheet/Makefile
index a9c3cf3..5135c0f 100644
--- a/src/psheet/Makefile
+++ b/src/kd/psheet/Makefile
@@ -6,4 +6,4 @@ OBJS = psheet.o
 
 LIBS =
 
-include ../../lib/build.mak
\ No newline at end of file
+include $(ROOT_DIR)/lib/build.mak
\ No newline at end of file
diff --git a/src/psheet/psheet.c b/src/kd/psheet/psheet.c
similarity index 100%
rename from src/psheet/psheet.c
rename to src/kd/psheet/psheet.c
diff --git a/src/registry/exports.exp b/src/kd/registry/exports.exp
similarity index 100%
rename from src/registry/exports.exp
rename to src/kd/registry/exports.exp
diff --git a/src/rtc/Makefile b/src/kd/rtc/Makefile
similarity index 91%
rename from src/rtc/Makefile
rename to src/kd/rtc/Makefile
index 07fdaa9..216c106 100644
--- a/src/rtc/Makefile
+++ b/src/kd/rtc/Makefile
@@ -8,4 +8,4 @@ LIBS = -lInitForKernel -lInterruptManagerForKernel -lKDebugForKernel -lSysMemFor
 		-lThreadManForKernel -lUtilsForKernel -lsceSuspendForKernel -lsceSysEventForKernel -lsceSyscon_driver \
 			-lsceRtc -lsceRtc_driver
 
-include ../../lib/build.mak
+include $(ROOT_DIR)/lib/build.mak
diff --git a/src/rtc/exports.exp b/src/kd/rtc/exports.exp
similarity index 100%
rename from src/rtc/exports.exp
rename to src/kd/rtc/exports.exp
diff --git a/src/rtc/rtc.c b/src/kd/rtc/rtc.c
similarity index 100%
rename from src/rtc/rtc.c
rename to src/kd/rtc/rtc.c
diff --git a/src/rtc/rtc.h b/src/kd/rtc/rtc.h
similarity index 100%
rename from src/rtc/rtc.h
rename to src/kd/rtc/rtc.h
diff --git a/src/sysmem/Makefile b/src/kd/sysmem/Makefile
similarity index 88%
rename from src/sysmem/Makefile
rename to src/kd/sysmem/Makefile
index 9514023..9b59cf0 100644
--- a/src/sysmem/Makefile
+++ b/src/kd/sysmem/Makefile
@@ -4,5 +4,5 @@
 TARGET = sysmem
 OBJS = start.o heap.o partition.o memory.o misc.o debug.o memoryop.o uid.o sysevent.o suspend.o assert.o memblock.o sysclib.o utils.o kdebug.o sysmem.o intr.o
 
-include ../../lib/build.mak
+include $(ROOT_DIR)/lib/build.mak
 
diff --git a/src/sysmem/assert.c b/src/kd/sysmem/assert.c
similarity index 100%
rename from src/sysmem/assert.c
rename to src/kd/sysmem/assert.c
diff --git a/src/sysmem/debug.c b/src/kd/sysmem/debug.c
similarity index 100%
rename from src/sysmem/debug.c
rename to src/kd/sysmem/debug.c
diff --git a/src/sysmem/exports.exp b/src/kd/sysmem/exports.exp
similarity index 100%
rename from src/sysmem/exports.exp
rename to src/kd/sysmem/exports.exp
diff --git a/src/sysmem/heap.c b/src/kd/sysmem/heap.c
similarity index 100%
rename from src/sysmem/heap.c
rename to src/kd/sysmem/heap.c
diff --git a/src/sysmem/heap.h b/src/kd/sysmem/heap.h
similarity index 100%
rename from src/sysmem/heap.h
rename to src/kd/sysmem/heap.h
diff --git a/src/sysmem/intr.S b/src/kd/sysmem/intr.S
similarity index 100%
rename from src/sysmem/intr.S
rename to src/kd/sysmem/intr.S
diff --git a/src/sysmem/intr.h b/src/kd/sysmem/intr.h
similarity index 100%
rename from src/sysmem/intr.h
rename to src/kd/sysmem/intr.h
diff --git a/src/sysmem/kdebug.c b/src/kd/sysmem/kdebug.c
similarity index 100%
rename from src/sysmem/kdebug.c
rename to src/kd/sysmem/kdebug.c
diff --git a/src/sysmem/kdebug.h b/src/kd/sysmem/kdebug.h
similarity index 100%
rename from src/sysmem/kdebug.h
rename to src/kd/sysmem/kdebug.h
diff --git a/src/sysmem/memblock.c b/src/kd/sysmem/memblock.c
similarity index 100%
rename from src/sysmem/memblock.c
rename to src/kd/sysmem/memblock.c
diff --git a/src/sysmem/memory.c b/src/kd/sysmem/memory.c
similarity index 100%
rename from src/sysmem/memory.c
rename to src/kd/sysmem/memory.c
diff --git a/src/sysmem/memory.h b/src/kd/sysmem/memory.h
similarity index 100%
rename from src/sysmem/memory.h
rename to src/kd/sysmem/memory.h
diff --git a/src/sysmem/memoryop.c b/src/kd/sysmem/memoryop.c
similarity index 100%
rename from src/sysmem/memoryop.c
rename to src/kd/sysmem/memoryop.c
diff --git a/src/sysmem/memoryop.h b/src/kd/sysmem/memoryop.h
similarity index 100%
rename from src/sysmem/memoryop.h
rename to src/kd/sysmem/memoryop.h
diff --git a/src/sysmem/misc.c b/src/kd/sysmem/misc.c
similarity index 100%
rename from src/sysmem/misc.c
rename to src/kd/sysmem/misc.c
diff --git a/src/sysmem/misc.h b/src/kd/sysmem/misc.h
similarity index 100%
rename from src/sysmem/misc.h
rename to src/kd/sysmem/misc.h
diff --git a/src/sysmem/partition.c b/src/kd/sysmem/partition.c
similarity index 100%
rename from src/sysmem/partition.c
rename to src/kd/sysmem/partition.c
diff --git a/src/sysmem/partition.h b/src/kd/sysmem/partition.h
similarity index 100%
rename from src/sysmem/partition.h
rename to src/kd/sysmem/partition.h
diff --git a/src/sysmem/start.S b/src/kd/sysmem/start.S
similarity index 100%
rename from src/sysmem/start.S
rename to src/kd/sysmem/start.S
diff --git a/src/sysmem/start.h b/src/kd/sysmem/start.h
similarity index 100%
rename from src/sysmem/start.h
rename to src/kd/sysmem/start.h
diff --git a/src/sysmem/suspend.c b/src/kd/sysmem/suspend.c
similarity index 100%
rename from src/sysmem/suspend.c
rename to src/kd/sysmem/suspend.c
diff --git a/src/sysmem/suspend.h b/src/kd/sysmem/suspend.h
similarity index 100%
rename from src/sysmem/suspend.h
rename to src/kd/sysmem/suspend.h
diff --git a/src/sysmem/sysclib.c b/src/kd/sysmem/sysclib.c
similarity index 100%
rename from src/sysmem/sysclib.c
rename to src/kd/sysmem/sysclib.c
diff --git a/src/sysmem/sysevent.c b/src/kd/sysmem/sysevent.c
similarity index 100%
rename from src/sysmem/sysevent.c
rename to src/kd/sysmem/sysevent.c
diff --git a/src/sysmem/sysevent.h b/src/kd/sysmem/sysevent.h
similarity index 100%
rename from src/sysmem/sysevent.h
rename to src/kd/sysmem/sysevent.h
diff --git a/src/sysmem/sysmem.c b/src/kd/sysmem/sysmem.c
similarity index 100%
rename from src/sysmem/sysmem.c
rename to src/kd/sysmem/sysmem.c
diff --git a/src/sysmem/sysmem.h b/src/kd/sysmem/sysmem.h
similarity index 100%
rename from src/sysmem/sysmem.h
rename to src/kd/sysmem/sysmem.h
diff --git a/src/sysmem/uid.c b/src/kd/sysmem/uid.c
similarity index 100%
rename from src/sysmem/uid.c
rename to src/kd/sysmem/uid.c
diff --git a/src/sysmem/uid.h b/src/kd/sysmem/uid.h
similarity index 100%
rename from src/sysmem/uid.h
rename to src/kd/sysmem/uid.h
diff --git a/src/sysmem/utils.c b/src/kd/sysmem/utils.c
similarity index 100%
rename from src/sysmem/utils.c
rename to src/kd/sysmem/utils.c
diff --git a/src/systimer/Makefile b/src/kd/systimer/Makefile
similarity index 85%
rename from src/systimer/Makefile
rename to src/kd/systimer/Makefile
index a85e69f..eb0dcd7 100644
--- a/src/systimer/Makefile
+++ b/src/kd/systimer/Makefile
@@ -6,5 +6,5 @@ OBJS = systimer.o
 
 LIBS = -lInterruptManager -lInterruptManagerForKernel -lsceSuspendForKernel
 
-include ../../lib/build.mak
+include $(ROOT_DIR)/lib/build.mak
 
diff --git a/src/systimer/exports.exp b/src/kd/systimer/exports.exp
similarity index 100%
rename from src/systimer/exports.exp
rename to src/kd/systimer/exports.exp
diff --git a/src/systimer/systimer.c b/src/kd/systimer/systimer.c
similarity index 100%
rename from src/systimer/systimer.c
rename to src/kd/systimer/systimer.c
diff --git a/src/threadman/Makefile b/src/kd/threadman/Makefile
similarity index 87%
rename from src/threadman/Makefile
rename to src/kd/threadman/Makefile
index ee88db2..248c864 100644
--- a/src/threadman/Makefile
+++ b/src/kd/threadman/Makefile
@@ -9,4 +9,4 @@ OBJS = threadman.o
 LIBS = 	-lInterruptManagerForKernel -lExceptionManagerForKernel -lSysMemForKernel -lKDebugForKernel \
 		-lsceSuspendForKernel -lSysclibForKernel -lLoadCoreForKernel
 
-include ../../lib/build.mak
\ No newline at end of file
+include $(ROOT_DIR)/lib/build.mak
\ No newline at end of file
diff --git a/src/threadman/exports.exp b/src/kd/threadman/exports.exp
similarity index 100%
rename from src/threadman/exports.exp
rename to src/kd/threadman/exports.exp
diff --git a/src/threadman/threadman.c b/src/kd/threadman/threadman.c
similarity index 100%
rename from src/threadman/threadman.c
rename to src/kd/threadman/threadman.c
diff --git a/src/usbacc/Makefile b/src/kd/usbacc/Makefile
similarity index 83%
rename from src/usbacc/Makefile
rename to src/kd/usbacc/Makefile
index 7a13d58..3f0bb6e 100644
--- a/src/usbacc/Makefile
+++ b/src/kd/usbacc/Makefile
@@ -8,4 +8,4 @@ OBJS = usbacc.o
 
 LIBS = -lsceUsbBus_driver -lInterruptManagerForKernel -lThreadManForKernel -lUtilsForKernel
 
-include ../../lib/build.mak
+include $(ROOT_DIR)/lib/build.mak
diff --git a/src/usbacc/exports.exp b/src/kd/usbacc/exports.exp
similarity index 100%
rename from src/usbacc/exports.exp
rename to src/kd/usbacc/exports.exp
diff --git a/src/usbacc/usbacc.c b/src/kd/usbacc/usbacc.c
similarity index 100%
rename from src/usbacc/usbacc.c
rename to src/kd/usbacc/usbacc.c
diff --git a/src/usersystemlib/Makefile b/src/kd/usersystemlib/Makefile
similarity index 88%
rename from src/usersystemlib/Makefile
rename to src/kd/usersystemlib/Makefile
index 78038c9..9bfa0a2 100644
--- a/src/usersystemlib/Makefile
+++ b/src/kd/usersystemlib/Makefile
@@ -8,4 +8,4 @@ OBJS = usersystemlib.o intr.o lazy.o thread.o lwmutex.o mem.o
 
 LIBS = -lSysMemUserForUser -lInterruptManager -lThreadManForUser
 
-include ../../lib/build.mak
+include $(ROOT_DIR)/lib/build.mak
diff --git a/src/usersystemlib/exports.exp b/src/kd/usersystemlib/exports.exp
similarity index 100%
rename from src/usersystemlib/exports.exp
rename to src/kd/usersystemlib/exports.exp
diff --git a/src/usersystemlib/intr.S b/src/kd/usersystemlib/intr.S
similarity index 97%
rename from src/usersystemlib/intr.S
rename to src/kd/usersystemlib/intr.S
index ae6b135..c972990 100644
--- a/src/usersystemlib/intr.S
+++ b/src/kd/usersystemlib/intr.S
@@ -1,7 +1,7 @@
 # Copyright (C) 2011, 2012, 2013 The uOFW team
 # See the file COPYING for copying permission.
 
-#include "../../include/common_asm.h"
+#include "common_asm.h"
 
     .text
     .set noat
diff --git a/src/usersystemlib/lazy.c b/src/kd/usersystemlib/lazy.c
similarity index 100%
rename from src/usersystemlib/lazy.c
rename to src/kd/usersystemlib/lazy.c
diff --git a/src/usersystemlib/lwmutex.c b/src/kd/usersystemlib/lwmutex.c
similarity index 100%
rename from src/usersystemlib/lwmutex.c
rename to src/kd/usersystemlib/lwmutex.c
diff --git a/src/usersystemlib/mem.c b/src/kd/usersystemlib/mem.c
similarity index 100%
rename from src/usersystemlib/mem.c
rename to src/kd/usersystemlib/mem.c
diff --git a/src/usersystemlib/thread.c b/src/kd/usersystemlib/thread.c
similarity index 100%
rename from src/usersystemlib/thread.c
rename to src/kd/usersystemlib/thread.c
diff --git a/src/usersystemlib/usersystemlib.c b/src/kd/usersystemlib/usersystemlib.c
similarity index 100%
rename from src/usersystemlib/usersystemlib.c
rename to src/kd/usersystemlib/usersystemlib.c
diff --git a/src/usersystemlib/usersystemlib_int.h b/src/kd/usersystemlib/usersystemlib_int.h
similarity index 100%
rename from src/usersystemlib/usersystemlib_int.h
rename to src/kd/usersystemlib/usersystemlib_int.h
diff --git a/src/wlan/exports.exp b/src/kd/wlan/exports.exp
similarity index 100%
rename from src/wlan/exports.exp
rename to src/kd/wlan/exports.exp
diff --git a/src/wlanfirm/Makefile b/src/kd/wlanfirm/Makefile
similarity index 85%
rename from src/wlanfirm/Makefile
rename to src/kd/wlanfirm/Makefile
index 02ce2a5..e44bc87 100644
--- a/src/wlanfirm/Makefile
+++ b/src/kd/wlanfirm/Makefile
@@ -8,4 +8,4 @@ OBJS = wlanfirm.o
 
 LIBS = -lsceIdStorage_driver -lsceWlanDrv_driver
 
-include ../../lib/build.mak
+include $(ROOT_DIR)/lib/build.mak
diff --git a/src/wlanfirm/exports.exp b/src/kd/wlanfirm/exports.exp
similarity index 100%
rename from src/wlanfirm/exports.exp
rename to src/kd/wlanfirm/exports.exp
diff --git a/src/wlanfirm/firmware/magpie.c b/src/kd/wlanfirm/firmware/magpie.c
similarity index 100%
rename from src/wlanfirm/firmware/magpie.c
rename to src/kd/wlanfirm/firmware/magpie.c
diff --git a/src/wlanfirm/firmware/magpie_helper.c b/src/kd/wlanfirm/firmware/magpie_helper.c
similarity index 100%
rename from src/wlanfirm/firmware/magpie_helper.c
rename to src/kd/wlanfirm/firmware/magpie_helper.c
diff --git a/src/wlanfirm/firmware/voyager.c b/src/kd/wlanfirm/firmware/voyager.c
similarity index 100%
rename from src/wlanfirm/firmware/voyager.c
rename to src/kd/wlanfirm/firmware/voyager.c
diff --git a/src/wlanfirm/firmware/voyager_helper.c b/src/kd/wlanfirm/firmware/voyager_helper.c
similarity index 100%
rename from src/wlanfirm/firmware/voyager_helper.c
rename to src/kd/wlanfirm/firmware/voyager_helper.c
diff --git a/src/wlanfirm/wlanfirm.c b/src/kd/wlanfirm/wlanfirm.c
similarity index 100%
rename from src/wlanfirm/wlanfirm.c
rename to src/kd/wlanfirm/wlanfirm.c
diff --git a/src/syscon/Makefile b/src/syscon/Makefile
index 8aa58ac..00100ba 100644
--- a/src/syscon/Makefile
+++ b/src/syscon/Makefile
@@ -6,5 +6,5 @@ OBJS = power.o syscon.o
 
 LIBS = -lsceSysEventForKernel -lKDebugForKernel -lInterruptManagerForKernel -lThreadManForKernel -lSysclibForKernel -lUtilsForKernel -lsceSysreg_driver -lsceGpio_driver
 
-include ../../lib/build.mak
+include $(ROOT_DIR)/lib/build.mak