diff --git a/0_template/Makefile b/demo-01/Makefile
similarity index 98%
rename from 0_template/Makefile
rename to demo-01/Makefile
index 4d128dc..62bf104 100644
--- a/0_template/Makefile
+++ b/demo-01/Makefile
@@ -17,7 +17,7 @@ include $(DEVKITPPC)/wii_rules
 #---------------------------------------------------------------------------------
 TARGET		:=	$(notdir $(CURDIR))
 BUILD		:=	build
-SOURCES		:=	sources sources/gfx ../GRRLIB/GRRLIB ../GRRLIB/lib/libpng ../GRRLIB/lib/libpng/pngu
+SOURCES		:=	source source/gfx ../GRRLIB/GRRLIB ../GRRLIB/lib/libpng ../GRRLIB/lib/libpng/pngu
 DATA		:=	data  
 INCLUDES	:=
 
diff --git a/1_Demo/sources/gfx/BMfont1.c b/demo-01/source/gfx/BMfont1.c
similarity index 100%
rename from 1_Demo/sources/gfx/BMfont1.c
rename to demo-01/source/gfx/BMfont1.c
diff --git a/1_Demo/sources/gfx/BMfont1.h b/demo-01/source/gfx/BMfont1.h
similarity index 100%
rename from 1_Demo/sources/gfx/BMfont1.h
rename to demo-01/source/gfx/BMfont1.h
diff --git a/1_Demo/sources/gfx/BMfont1.png b/demo-01/source/gfx/BMfont1.png
similarity index 100%
rename from 1_Demo/sources/gfx/BMfont1.png
rename to demo-01/source/gfx/BMfont1.png
diff --git a/1_Demo/sources/gfx/BMfont2.c b/demo-01/source/gfx/BMfont2.c
similarity index 100%
rename from 1_Demo/sources/gfx/BMfont2.c
rename to demo-01/source/gfx/BMfont2.c
diff --git a/1_Demo/sources/gfx/BMfont2.h b/demo-01/source/gfx/BMfont2.h
similarity index 100%
rename from 1_Demo/sources/gfx/BMfont2.h
rename to demo-01/source/gfx/BMfont2.h
diff --git a/1_Demo/sources/gfx/BMfont2.png b/demo-01/source/gfx/BMfont2.png
similarity index 100%
rename from 1_Demo/sources/gfx/BMfont2.png
rename to demo-01/source/gfx/BMfont2.png
diff --git a/1_Demo/sources/gfx/BMfont3.c b/demo-01/source/gfx/BMfont3.c
similarity index 100%
rename from 1_Demo/sources/gfx/BMfont3.c
rename to demo-01/source/gfx/BMfont3.c
diff --git a/1_Demo/sources/gfx/BMfont3.h b/demo-01/source/gfx/BMfont3.h
similarity index 100%
rename from 1_Demo/sources/gfx/BMfont3.h
rename to demo-01/source/gfx/BMfont3.h
diff --git a/1_Demo/sources/gfx/BMfont3.png b/demo-01/source/gfx/BMfont3.png
similarity index 100%
rename from 1_Demo/sources/gfx/BMfont3.png
rename to demo-01/source/gfx/BMfont3.png
diff --git a/1_Demo/sources/gfx/BMfont4.c b/demo-01/source/gfx/BMfont4.c
similarity index 100%
rename from 1_Demo/sources/gfx/BMfont4.c
rename to demo-01/source/gfx/BMfont4.c
diff --git a/1_Demo/sources/gfx/BMfont4.h b/demo-01/source/gfx/BMfont4.h
similarity index 100%
rename from 1_Demo/sources/gfx/BMfont4.h
rename to demo-01/source/gfx/BMfont4.h
diff --git a/1_Demo/sources/gfx/BMfont4.png b/demo-01/source/gfx/BMfont4.png
similarity index 100%
rename from 1_Demo/sources/gfx/BMfont4.png
rename to demo-01/source/gfx/BMfont4.png
diff --git a/1_Demo/sources/gfx/BMfont5.h b/demo-01/source/gfx/BMfont5.h
similarity index 100%
rename from 1_Demo/sources/gfx/BMfont5.h
rename to demo-01/source/gfx/BMfont5.h
diff --git a/1_Demo/sources/gfx/BMfont5.png b/demo-01/source/gfx/BMfont5.png
similarity index 100%
rename from 1_Demo/sources/gfx/BMfont5.png
rename to demo-01/source/gfx/BMfont5.png
diff --git a/1_Demo/sources/gfx/sprite.h b/demo-01/source/gfx/sprite.h
similarity index 100%
rename from 1_Demo/sources/gfx/sprite.h
rename to demo-01/source/gfx/sprite.h
diff --git a/1_Demo/sources/gfx/sprite.png b/demo-01/source/gfx/sprite.png
similarity index 100%
rename from 1_Demo/sources/gfx/sprite.png
rename to demo-01/source/gfx/sprite.png
diff --git a/1_Demo/sources/gfx/test_jpg.c b/demo-01/source/gfx/test_jpg.c
similarity index 100%
rename from 1_Demo/sources/gfx/test_jpg.c
rename to demo-01/source/gfx/test_jpg.c
diff --git a/1_Demo/sources/gfx/test_jpg.h b/demo-01/source/gfx/test_jpg.h
similarity index 100%
rename from 1_Demo/sources/gfx/test_jpg.h
rename to demo-01/source/gfx/test_jpg.h
diff --git a/1_Demo/sources/gfx/test_jpg.jpg b/demo-01/source/gfx/test_jpg.jpg
similarity index 100%
rename from 1_Demo/sources/gfx/test_jpg.jpg
rename to demo-01/source/gfx/test_jpg.jpg
diff --git a/1_Demo/sources/main.c b/demo-01/source/main.c
similarity index 100%
rename from 1_Demo/sources/main.c
rename to demo-01/source/main.c
diff --git a/1_Demo/Makefile b/template/Makefile
similarity index 98%
rename from 1_Demo/Makefile
rename to template/Makefile
index 4d128dc..62bf104 100644
--- a/1_Demo/Makefile
+++ b/template/Makefile
@@ -17,7 +17,7 @@ include $(DEVKITPPC)/wii_rules
 #---------------------------------------------------------------------------------
 TARGET		:=	$(notdir $(CURDIR))
 BUILD		:=	build
-SOURCES		:=	sources sources/gfx ../GRRLIB/GRRLIB ../GRRLIB/lib/libpng ../GRRLIB/lib/libpng/pngu
+SOURCES		:=	source source/gfx ../GRRLIB/GRRLIB ../GRRLIB/lib/libpng ../GRRLIB/lib/libpng/pngu
 DATA		:=	data  
 INCLUDES	:=
 
diff --git a/0_template/sources/main.c b/template/source/main.c
similarity index 100%
rename from 0_template/sources/main.c
rename to template/source/main.c