diff --git a/Makefile b/Makefile
index 1a22626f..5f4a1b58 100644
--- a/Makefile
+++ b/Makefile
@@ -262,7 +262,7 @@ obj/bin2h: bin2h/bin2h.c
 
 include $(wildcard $(DEPENDENCIES))
 
-obj/$(FILENAME)/windows_resources.o: msvc2003/CSE2.rc
+obj/$(FILENAME)/windows_resources.o: assets/resources/CSE2.rc
 	@mkdir -p $(@D)
 	@$(WINDRES) $< $@
 
diff --git a/msvc2003/CSE2.rc b/assets/resources/CSE2.rc
similarity index 95%
rename from msvc2003/CSE2.rc
rename to assets/resources/CSE2.rc
index 86558005..b61d32de 100644
--- a/msvc2003/CSE2.rc
+++ b/assets/resources/CSE2.rc
@@ -58,13 +58,13 @@ BEGIN
     END
 END
 
-CURSOR_IKA CURSOR "..\\assets\\resources\\CURSOR\\CURSOR_IKA.cur"
+CURSOR_IKA CURSOR "CURSOR\\CURSOR_IKA.cur"
 
-CURSOR_NORMAL CURSOR "..\\assets\\resources\\CURSOR\\CURSOR_NORMAL.cur"
+CURSOR_NORMAL CURSOR "CURSOR\\CURSOR_NORMAL.cur"
 
-0 ICON "..\\assets\\resources\\ICON\\0.ico"
+0 ICON "ICON\\0.ico"
 
-ICON_MINI ICON "..\\assets\\resources\\ICON\\ICON_MINI.ico"
+ICON_MINI ICON "ICON\\ICON_MINI.ico"
 
 #endif    // Japanese resources
 /////////////////////////////////////////////////////////////////////////////
diff --git a/msvc2003/resource1.h b/assets/resources/resource1.h
similarity index 100%
rename from msvc2003/resource1.h
rename to assets/resources/resource1.h
diff --git a/src/Organya.cpp b/src/Organya.cpp
index 804b8514..7798073e 100644
--- a/src/Organya.cpp
+++ b/src/Organya.cpp
@@ -69,7 +69,7 @@ typedef struct MUSICINFO
 	unsigned short alloc_note;	// Number of allocated notes
 	long repeat_x;	// Repeat
 	long end_x;	// End of song (Return to repeat)
-	TRACKDATA tdata[16];
+	TRACKDATA tdata[MAXTRACK];
 } MUSICINFO;
 
 // メインクラス。このアプリケーションの中心。（クラスってやつを初めて使う） (Main class. The heart of this application. (Class is used for the first time))