diff --git a/src/asm/make.sh b/src/asm/Makefile
similarity index 81%
rename from src/asm/make.sh
rename to src/asm/Makefile
index 863334a..b574de2 100644
--- a/src/asm/make.sh
+++ b/src/asm/Makefile
@@ -6,8 +6,9 @@ AR=mips-elf-ar
 CC=mips-elf-gcc
 LD=mips-elf-ld
 OBJCOPY=mips-elf-objcopy
+ROMGEN=romgen
 
-CFLAGS=-march=$TARGET
+CFLAGS=-march=$(TARGET)
 
 libsys.a:
 	$(CC) $(CFLAGS) -c libsys/startup.s -o startup.o
@@ -17,14 +18,13 @@ libsys.a:
 	$(AR) -r libsys.a startup.o init.o kernel.o utils.o
 
 
-testbench.elf:
+testbench.elf: libsys.a
 	$(CC) $(CFLAGS) -c testbench.c -o testbench.o
 	$(LD) $(CFLAGS) -lsys -o $@
 	$(OBJCOPY) -j .stext -j .ktext -j .text $@ -O binary $@.ROM.bin
 	$(OBJCOPY) -j .data $@.elf -O binary $@.RAM.bin
-
-romgen.exe $@.ROM.bin $ROM_WORDADDR_WIDTH
-ramgen.exe $@.RAM.bin $RAM_WORDADDR_WIDTH
+	$(ROMGEN) $@.ROM.bin $ROM_WORDADDR_WIDTH
+	$(ROMGEN) $@.RAM.bin $RAM_WORDADDR_WIDTH
 
 #xtclsh.exe $TARGET.RAM.tcl
 #xtclsh.exe $TARGET.ROM.tcl
diff --git a/src/asm/exception.s b/src/asm/libsys/exception.s
similarity index 100%
rename from src/asm/exception.s
rename to src/asm/libsys/exception.s
diff --git a/src/asm/init.s b/src/asm/libsys/init.s
similarity index 100%
rename from src/asm/init.s
rename to src/asm/libsys/init.s
diff --git a/src/asm/kernel.s b/src/asm/libsys/kernel.s
similarity index 100%
rename from src/asm/kernel.s
rename to src/asm/libsys/kernel.s
diff --git a/src/asm/startup.s b/src/asm/libsys/startup.s
similarity index 100%
rename from src/asm/startup.s
rename to src/asm/libsys/startup.s
diff --git a/src/asm/utils.c b/src/asm/libsys/utils.c
similarity index 100%
rename from src/asm/utils.c
rename to src/asm/libsys/utils.c
diff --git a/src/asm/utils.h b/src/asm/libsys/utils.h
similarity index 100%
rename from src/asm/utils.h
rename to src/asm/libsys/utils.h
diff --git a/src/asm/idata.ld b/src/asm/link/idata.ld
similarity index 100%
rename from src/asm/idata.ld
rename to src/asm/link/idata.ld
diff --git a/src/asm/link.ld b/src/asm/link/link.ld
similarity index 100%
rename from src/asm/link.ld
rename to src/asm/link/link.ld
diff --git a/src/asm/testbench.c b/src/asm/testbench.c
index 1cbf3b6..6c2bf93 100644
--- a/src/asm/testbench.c
+++ b/src/asm/testbench.c
@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
-#include "utils.h"
+#include "libsys/utils.h"
 
 #define	NO_ERROR		0x00000000
 #define	ERROR			0x80000000