diff --git a/benchmarks/riscv-coremark/Makefile b/benchmarks/riscv-coremark/Makefile
index b66b8cb7..fe5d196b 100644
--- a/benchmarks/riscv-coremark/Makefile
+++ b/benchmarks/riscv-coremark/Makefile
@@ -5,15 +5,8 @@ coremark.bare.riscv.objdump: coremark.bare.riscv
 	riscv64-unknown-elf-objdump -D coremark.bare.riscv > coremark.bare.riscv.objdump 
 
 coremark.bare.riscv:
-	BASEDIR=${CUR_DIR}
-	RISCV=/courses/e190ax/riscvcompiler
-	CMPATH=coremark
-	#pushd ../../addins/coremark
-	# run the compile
-	echo "Start compilation"
-
-	make -C ${CMPATH} PORT_DIR=${BASEDIR}/riscv64-baremetal compile RISCV=/courses/e190ax/riscvcompiler XCFLAGS=-march=rv64im
-	mv ${CMPATH}/coremark.bare.riscv .
+	make -C coremark PORT_DIR=./riscv64-baremetal compile RISCV=/courses/e190ax/riscvcompiler XCFLAGS="-march=rv64im"
+	mv coremark/coremark.bare.riscv .
 
 .PHONY: clean
 
diff --git a/wally-pipelined/bin/exe2memfile.pl b/bin/exe2memfile.pl
similarity index 100%
rename from wally-pipelined/bin/exe2memfile.pl
rename to bin/exe2memfile.pl
diff --git a/wally-pipelined/bin/exe2memfile.pl.old b/bin/exe2memfile.pl.old
similarity index 100%
rename from wally-pipelined/bin/exe2memfile.pl.old
rename to bin/exe2memfile.pl.old
diff --git a/wally-pipelined/bin/extractFunctionRadix.sh b/bin/extractFunctionRadix.sh
similarity index 100%
rename from wally-pipelined/bin/extractFunctionRadix.sh
rename to bin/extractFunctionRadix.sh