diff --git a/examples/Makefile b/examples/Makefile
new file mode 100644
index 0000000..a586a4f
--- /dev/null
+++ b/examples/Makefile
@@ -0,0 +1,13 @@
+SUBDIRS:= `ls | egrep -v '^(CVS)$$'`
+
+DATESTRING	:=	$(shell date +%Y)$(shell date +%m)$(shell date +%d)
+
+all:
+	@for i in $(SUBDIRS); do if test -e $$i/Makefile ; then $(MAKE) -C $$i || { exit 1;} fi; done;
+
+clean:
+	@rm -f *.bz2
+	@for i in $(SUBDIRS); do if test -e $$i/Makefile ; then $(MAKE) -C $$i clean || { exit 1;} fi; done;
+
+dist: clean
+	@tar --exclude=*CVS* -cvjf wii-examples-$(DATESTRING).tar.bz2 *
diff --git a/demo-01/Makefile b/examples/demo-01/Makefile
similarity index 97%
rename from demo-01/Makefile
rename to examples/demo-01/Makefile
index 62bf104..814ac9f 100644
--- a/demo-01/Makefile
+++ b/examples/demo-01/Makefile
@@ -17,7 +17,7 @@ include $(DEVKITPPC)/wii_rules
 #---------------------------------------------------------------------------------
 TARGET		:=	$(notdir $(CURDIR))
 BUILD		:=	build
-SOURCES		:=	source source/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	:=
 
@@ -39,7 +39,7 @@ LIBS	:=	-lpng -ljpeg -lz -lfat -lwiiuse -lbte -logc -lm
 # list of directories containing libraries, this must be the top level containing
 # include and lib
 #---------------------------------------------------------------------------------
-LIBDIRS	:= $(CURDIR)/../GRRLIB
+LIBDIRS	:= $(CURDIR)/../../GRRLIB
 
 #---------------------------------------------------------------------------------
 # no real need to edit anything past this point unless you need to add additional
diff --git a/demo-01/source/gfx/BMfont1.c b/examples/demo-01/source/gfx/BMfont1.c
similarity index 100%
rename from demo-01/source/gfx/BMfont1.c
rename to examples/demo-01/source/gfx/BMfont1.c
diff --git a/demo-01/source/gfx/BMfont1.h b/examples/demo-01/source/gfx/BMfont1.h
similarity index 100%
rename from demo-01/source/gfx/BMfont1.h
rename to examples/demo-01/source/gfx/BMfont1.h
diff --git a/demo-01/source/gfx/BMfont1.png b/examples/demo-01/source/gfx/BMfont1.png
similarity index 100%
rename from demo-01/source/gfx/BMfont1.png
rename to examples/demo-01/source/gfx/BMfont1.png
diff --git a/demo-01/source/gfx/BMfont2.c b/examples/demo-01/source/gfx/BMfont2.c
similarity index 100%
rename from demo-01/source/gfx/BMfont2.c
rename to examples/demo-01/source/gfx/BMfont2.c
diff --git a/demo-01/source/gfx/BMfont2.h b/examples/demo-01/source/gfx/BMfont2.h
similarity index 100%
rename from demo-01/source/gfx/BMfont2.h
rename to examples/demo-01/source/gfx/BMfont2.h
diff --git a/demo-01/source/gfx/BMfont2.png b/examples/demo-01/source/gfx/BMfont2.png
similarity index 100%
rename from demo-01/source/gfx/BMfont2.png
rename to examples/demo-01/source/gfx/BMfont2.png
diff --git a/demo-01/source/gfx/BMfont3.c b/examples/demo-01/source/gfx/BMfont3.c
similarity index 100%
rename from demo-01/source/gfx/BMfont3.c
rename to examples/demo-01/source/gfx/BMfont3.c
diff --git a/demo-01/source/gfx/BMfont3.h b/examples/demo-01/source/gfx/BMfont3.h
similarity index 100%
rename from demo-01/source/gfx/BMfont3.h
rename to examples/demo-01/source/gfx/BMfont3.h
diff --git a/demo-01/source/gfx/BMfont3.png b/examples/demo-01/source/gfx/BMfont3.png
similarity index 100%
rename from demo-01/source/gfx/BMfont3.png
rename to examples/demo-01/source/gfx/BMfont3.png
diff --git a/demo-01/source/gfx/BMfont4.c b/examples/demo-01/source/gfx/BMfont4.c
similarity index 100%
rename from demo-01/source/gfx/BMfont4.c
rename to examples/demo-01/source/gfx/BMfont4.c
diff --git a/demo-01/source/gfx/BMfont4.h b/examples/demo-01/source/gfx/BMfont4.h
similarity index 100%
rename from demo-01/source/gfx/BMfont4.h
rename to examples/demo-01/source/gfx/BMfont4.h
diff --git a/demo-01/source/gfx/BMfont4.png b/examples/demo-01/source/gfx/BMfont4.png
similarity index 100%
rename from demo-01/source/gfx/BMfont4.png
rename to examples/demo-01/source/gfx/BMfont4.png
diff --git a/demo-01/source/gfx/BMfont5.h b/examples/demo-01/source/gfx/BMfont5.h
similarity index 100%
rename from demo-01/source/gfx/BMfont5.h
rename to examples/demo-01/source/gfx/BMfont5.h
diff --git a/demo-01/source/gfx/BMfont5.png b/examples/demo-01/source/gfx/BMfont5.png
similarity index 100%
rename from demo-01/source/gfx/BMfont5.png
rename to examples/demo-01/source/gfx/BMfont5.png
diff --git a/demo-01/source/gfx/sprite.h b/examples/demo-01/source/gfx/sprite.h
similarity index 100%
rename from demo-01/source/gfx/sprite.h
rename to examples/demo-01/source/gfx/sprite.h
diff --git a/demo-01/source/gfx/sprite.png b/examples/demo-01/source/gfx/sprite.png
similarity index 100%
rename from demo-01/source/gfx/sprite.png
rename to examples/demo-01/source/gfx/sprite.png
diff --git a/demo-01/source/gfx/test_jpg.c b/examples/demo-01/source/gfx/test_jpg.c
similarity index 100%
rename from demo-01/source/gfx/test_jpg.c
rename to examples/demo-01/source/gfx/test_jpg.c
diff --git a/demo-01/source/gfx/test_jpg.h b/examples/demo-01/source/gfx/test_jpg.h
similarity index 100%
rename from demo-01/source/gfx/test_jpg.h
rename to examples/demo-01/source/gfx/test_jpg.h
diff --git a/demo-01/source/gfx/test_jpg.jpg b/examples/demo-01/source/gfx/test_jpg.jpg
similarity index 100%
rename from demo-01/source/gfx/test_jpg.jpg
rename to examples/demo-01/source/gfx/test_jpg.jpg
diff --git a/demo-01/source/main.c b/examples/demo-01/source/main.c
similarity index 96%
rename from demo-01/source/main.c
rename to examples/demo-01/source/main.c
index 50547c7..ce1b7cb 100644
--- a/demo-01/source/main.c
+++ b/examples/demo-01/source/main.c
@@ -6,7 +6,7 @@
 
         Template Code 1
 ============================================*/
-#include "../../GRRLIB/GRRLIB/GRRLIB.h"
+#include "../../../GRRLIB/GRRLIB/GRRLIB.h"
 
 #include <ogc/lwp_watchdog.h>	// needed for gettime and ticks_to_millisecs
 #include <stdlib.h>
diff --git a/template/Makefile b/examples/template/Makefile
similarity index 97%
rename from template/Makefile
rename to examples/template/Makefile
index 62bf104..814ac9f 100644
--- a/template/Makefile
+++ b/examples/template/Makefile
@@ -17,7 +17,7 @@ include $(DEVKITPPC)/wii_rules
 #---------------------------------------------------------------------------------
 TARGET		:=	$(notdir $(CURDIR))
 BUILD		:=	build
-SOURCES		:=	source source/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	:=
 
@@ -39,7 +39,7 @@ LIBS	:=	-lpng -ljpeg -lz -lfat -lwiiuse -lbte -logc -lm
 # list of directories containing libraries, this must be the top level containing
 # include and lib
 #---------------------------------------------------------------------------------
-LIBDIRS	:= $(CURDIR)/../GRRLIB
+LIBDIRS	:= $(CURDIR)/../../GRRLIB
 
 #---------------------------------------------------------------------------------
 # no real need to edit anything past this point unless you need to add additional
diff --git a/template/source/main.c b/examples/template/source/main.c
similarity index 89%
rename from template/source/main.c
rename to examples/template/source/main.c
index 4fa172b..afe6d96 100644
--- a/template/source/main.c
+++ b/examples/template/source/main.c
@@ -6,7 +6,7 @@
 
         Minimum Code To Use GRRLIB
 ============================================*/
-#include "../../GRRLIB/GRRLIB/GRRLIB.h"
+#include "../../../GRRLIB/GRRLIB/GRRLIB.h"
 
 
 #include <stdlib.h>
diff --git a/README.TXT b/readme.txt
similarity index 100%
rename from README.TXT
rename to readme.txt