diff --git a/Makefile b/Makefile
index f3b0496..fe7d593 100644
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,22 @@
-CFLAGS = -Isaturn -Imath
-OPT = -O1
-
+CFLAGS = -Isaturn
+OPT = -Os
 LIBGCC = $(shell $(CC) -print-file-name=libgcc.a)
 
-all: raytracing.iso
+all: raytracing.iso vdp2.iso
 
 LIB = ./saturn
 include $(LIB)/common.mk
 
-sh/lib1funcs.o: CFLAGS += -DL_ashiftrt
+sh/lib1funcs.o: CFLAGS += -DL_ashiftrt -DL_movmem
 
-raytracing.elf: main-saturn.o raytracing.o sh/lib1funcs.o
+raytracing/raytracing.elf: CFLAGS += -Imath -DUSE_SH2_DVSR
+raytracing/raytracing.elf: raytracing/main-saturn.o raytracing/raytracing.o sh/lib1funcs.o
 
 # clean
 clean: clean-sh
 clean-sh:
-	rm -f sh/*.o
+	find -P \
+		-not -path './saturn/*' \
+		-regextype posix-egrep \
+		-regex '.*\.(iso|o|bin|elf|cue)$$' \
+		-exec rm {} \;
diff --git a/main-hosted.cpp b/raytracing/main-hosted.cpp
similarity index 100%
rename from main-hosted.cpp
rename to raytracing/main-hosted.cpp
diff --git a/main-saturn.cpp b/raytracing/main-saturn.cpp
similarity index 100%
rename from main-saturn.cpp
rename to raytracing/main-saturn.cpp
diff --git a/raytracing.cpp b/raytracing/raytracing.cpp
similarity index 100%
rename from raytracing.cpp
rename to raytracing/raytracing.cpp
diff --git a/raytracing.hpp b/raytracing/raytracing.hpp
similarity index 100%
rename from raytracing.hpp
rename to raytracing/raytracing.hpp