diff --git a/Makefile b/Makefile
index 7b429e9..c3b7828 100644
--- a/Makefile
+++ b/Makefile
@@ -1,20 +1,56 @@
 BUILD_DIR = build
+
+# ================
+# Hardware options
+# ================
 # SOURCE_V = $(wildcard hdl/*.v)
 # TESTBENCH_V = $(wildcard hdl/tb/*.v)
 SOURCE_V = hdl/core.v
 TESTBENCH_V = hdl/tb/core_tb.v
 
+# ================
+# Software options
+# ================
+CC = riscv64-linux-gnu-gcc
+# CFLAGS = -march=rv32i -mabi=ilp32
+CFLAGS = -march=rv64i -mabi=lp64
+
+AS = riscv64-linux-gnu-as
+ASFLAGS = $(CFLAGS)
+
+LD = riscv64-linux-gnu-ld
+LDFLAGS = -T
+
 all: sim
 
-$(BUILD_DIR):
-	mkdir -p $(BUILD_DIR)
-
+## Hardware
 $(BUILD_DIR)/tb.out: $(SOURCE_V) $(TESTBENCH_V) | $(BUILD_DIR)
 	iverilog $^ -o $@
 
-sim: $(BUILD_DIR)/tb.out
+## Software
+$(BUILD_DIR)/%.o: test/%.S | $(BUILD_DIR)
+	$(AS) $(ASFLAGS) $^ -o $@
+
+$(BUILD_DIR)/%.o: test/%.c | $(BUILD_DIR)
+	$(CC) $(CFLAGS) $^ -o $@
+
+$(BUILD_DIR)/%.elf: test/%.ld $(BUILD_DIR)/%.o | $(BUILD_DIR)
+	$(LD) $(LDFLAGS) $^ -o $@
+
+$(BUILD_DIR)/text.hex: $(BUILD_DIR)/test.elf
+	riscv64-linux-gnu-objdump -s $^ | sed -n '/.text/,$$p' | tail -n+2 | sed -n '/.data/,$$!p' | cut -f3-6 -d ' ' | sed -e 's/ /\n/g' | sed 's/^\(..\)\(..\)\(..\)\(..\)/\4\3\2\1/' > $@
+
+$(BUILD_DIR)/data.hex: $(BUILD_DIR)/test.elf
+	riscv64-linux-gnu-objdump -s $^ | sed -n '/.data/,$$p' | tail -n+2 | sed -n '/.bss/,$$!p' | cut -f3-6 -d ' ' | sed -e 's/ /\n/g' | sed 's/^\(..\)\(..\)\(..\)\(..\)/\4\3\2\1/' > $@
+
+sim: $(BUILD_DIR)/tb.out $(BUILD_DIR)/text.hex $(BUILD_DIR)/data.hex
 	cd $(BUILD_DIR) && ./tb.out
 
+
+## General
+$(BUILD_DIR):
+	mkdir -p $(BUILD_DIR)
+
 clean:
 	rm -rf $(BUILD_DIR)
 
diff --git a/hdl/tb/core_tb.v b/hdl/tb/core_tb.v
index 09eae0e..be3dd1d 100644
--- a/hdl/tb/core_tb.v
+++ b/hdl/tb/core_tb.v
@@ -32,7 +32,7 @@ initial begin: mem_inst_init
     for (i=0; i<MEM_INST_LENGTH; i=i+1) begin
         mem_inst[i] = INST_NOP;
     end
-    $readmemh("../test/text.hex", mem_inst);
+    $readmemh("text.hex", mem_inst);
 end
 
 // Data memory
@@ -48,7 +48,7 @@ initial begin: mem_data_init
     for (i=0; i<MEM_DATA_LENGTH; i=i+1) begin
         mem_data[i] = DATA_DEFAULT;
     end
-    $readmemh("../test/data.hex", mem_data);
+    $readmemh("data.hex", mem_data);
 end
 
 initial begin
diff --git a/test/Makefile b/test/Makefile
deleted file mode 100644
index 2286429..0000000
--- a/test/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-BUILD_DIR = build
-CC = riscv64-linux-gnu-gcc
-# CFLAGS = -march=rv32i -mabi=ilp32
-CFLAGS = -march=rv64i -mabi=lp64
-
-AS = riscv64-linux-gnu-as
-ASFLAGS = $(CFLAGS)
-
-LD = riscv64-linux-gnu-ld
-LDFLAGS = -T test.ld
-
-all: $(BUILD_DIR)/text.hex $(BUILD_DIR)/data.hex
-
-$(BUILD_DIR):
-	mkdir -p $(BUILD_DIR)
-	
-$(BUILD_DIR)/%.o: %.S | $(BUILD_DIR)
-	$(AS) $(ASFLAGS) $^ -o $@
-
-$(BUILD_DIR)/%.o: %.c | $(BUILD_DIR)
-	$(CC) $(CFLAGS) $^ -o $@
-
-$(BUILD_DIR)/%.elf: $(BUILD_DIR)/%.o %.ld
-	$(LD) $(LDFLAGS) $< -o $@
-
-$(BUILD_DIR)/text.hex: $(BUILD_DIR)/test.elf
-	riscv64-linux-gnu-objdump -s $^ | sed -n '/.text/,$$p' | tail -n+2 | sed -n '/.data/,$$!p' | cut -f3-6 -d ' ' | sed -e 's/ /\n/g' | sed 's/^\(..\)\(..\)\(..\)\(..\)/\4\3\2\1/' > $@
-
-$(BUILD_DIR)/data.hex: $(BUILD_DIR)/test.elf
-	riscv64-linux-gnu-objdump -s $^ | sed -n '/.data/,$$p' | tail -n+2 | sed -n '/.bss/,$$!p' | cut -f3-6 -d ' ' | sed -e 's/ /\n/g' | sed 's/^\(..\)\(..\)\(..\)\(..\)/\4\3\2\1/' > $@
-
-clean:
-	rm -rf $(BUILD_DIR)
\ No newline at end of file