diff --git a/3.0.5a/0_Minimum/Makefile b/0_template/Makefile
similarity index 100%
rename from 3.0.5a/0_Minimum/Makefile
rename to 0_template/Makefile
diff --git a/3.0.5a/0_Minimum/sources/main.c b/0_template/sources/main.c
similarity index 100%
rename from 3.0.5a/0_Minimum/sources/main.c
rename to 0_template/sources/main.c
diff --git a/3.0.5a/1_Template/Makefile b/1_Demo/Makefile
similarity index 100%
rename from 3.0.5a/1_Template/Makefile
rename to 1_Demo/Makefile
diff --git a/3.0.5a/1_Template/sources/gfx/BMfont1.c b/1_Demo/sources/gfx/BMfont1.c
similarity index 100%
rename from 3.0.5a/1_Template/sources/gfx/BMfont1.c
rename to 1_Demo/sources/gfx/BMfont1.c
diff --git a/3.0.5a/1_Template/sources/gfx/BMfont1.h b/1_Demo/sources/gfx/BMfont1.h
similarity index 100%
rename from 3.0.5a/1_Template/sources/gfx/BMfont1.h
rename to 1_Demo/sources/gfx/BMfont1.h
diff --git a/3.0.5a/1_Template/sources/gfx/BMfont1.png b/1_Demo/sources/gfx/BMfont1.png
similarity index 100%
rename from 3.0.5a/1_Template/sources/gfx/BMfont1.png
rename to 1_Demo/sources/gfx/BMfont1.png
diff --git a/3.0.5a/1_Template/sources/gfx/BMfont2.c b/1_Demo/sources/gfx/BMfont2.c
similarity index 100%
rename from 3.0.5a/1_Template/sources/gfx/BMfont2.c
rename to 1_Demo/sources/gfx/BMfont2.c
diff --git a/3.0.5a/1_Template/sources/gfx/BMfont2.h b/1_Demo/sources/gfx/BMfont2.h
similarity index 100%
rename from 3.0.5a/1_Template/sources/gfx/BMfont2.h
rename to 1_Demo/sources/gfx/BMfont2.h
diff --git a/3.0.5a/1_Template/sources/gfx/BMfont2.png b/1_Demo/sources/gfx/BMfont2.png
similarity index 100%
rename from 3.0.5a/1_Template/sources/gfx/BMfont2.png
rename to 1_Demo/sources/gfx/BMfont2.png
diff --git a/3.0.5a/1_Template/sources/gfx/BMfont3.c b/1_Demo/sources/gfx/BMfont3.c
similarity index 100%
rename from 3.0.5a/1_Template/sources/gfx/BMfont3.c
rename to 1_Demo/sources/gfx/BMfont3.c
diff --git a/3.0.5a/1_Template/sources/gfx/BMfont3.h b/1_Demo/sources/gfx/BMfont3.h
similarity index 100%
rename from 3.0.5a/1_Template/sources/gfx/BMfont3.h
rename to 1_Demo/sources/gfx/BMfont3.h
diff --git a/3.0.5a/1_Template/sources/gfx/BMfont3.png b/1_Demo/sources/gfx/BMfont3.png
similarity index 100%
rename from 3.0.5a/1_Template/sources/gfx/BMfont3.png
rename to 1_Demo/sources/gfx/BMfont3.png
diff --git a/3.0.5a/1_Template/sources/gfx/BMfont4.c b/1_Demo/sources/gfx/BMfont4.c
similarity index 100%
rename from 3.0.5a/1_Template/sources/gfx/BMfont4.c
rename to 1_Demo/sources/gfx/BMfont4.c
diff --git a/3.0.5a/1_Template/sources/gfx/BMfont4.h b/1_Demo/sources/gfx/BMfont4.h
similarity index 100%
rename from 3.0.5a/1_Template/sources/gfx/BMfont4.h
rename to 1_Demo/sources/gfx/BMfont4.h
diff --git a/3.0.5a/1_Template/sources/gfx/BMfont4.png b/1_Demo/sources/gfx/BMfont4.png
similarity index 100%
rename from 3.0.5a/1_Template/sources/gfx/BMfont4.png
rename to 1_Demo/sources/gfx/BMfont4.png
diff --git a/3.0.5a/1_Template/sources/gfx/BMfont5.h b/1_Demo/sources/gfx/BMfont5.h
similarity index 100%
rename from 3.0.5a/1_Template/sources/gfx/BMfont5.h
rename to 1_Demo/sources/gfx/BMfont5.h
diff --git a/3.0.5a/1_Template/sources/gfx/BMfont5.png b/1_Demo/sources/gfx/BMfont5.png
similarity index 100%
rename from 3.0.5a/1_Template/sources/gfx/BMfont5.png
rename to 1_Demo/sources/gfx/BMfont5.png
diff --git a/3.0.5a/1_Template/sources/gfx/sprite.h b/1_Demo/sources/gfx/sprite.h
similarity index 100%
rename from 3.0.5a/1_Template/sources/gfx/sprite.h
rename to 1_Demo/sources/gfx/sprite.h
diff --git a/3.0.5a/1_Template/sources/gfx/sprite.png b/1_Demo/sources/gfx/sprite.png
similarity index 100%
rename from 3.0.5a/1_Template/sources/gfx/sprite.png
rename to 1_Demo/sources/gfx/sprite.png
diff --git a/3.0.5a/1_Template/sources/gfx/test_jpg.c b/1_Demo/sources/gfx/test_jpg.c
similarity index 100%
rename from 3.0.5a/1_Template/sources/gfx/test_jpg.c
rename to 1_Demo/sources/gfx/test_jpg.c
diff --git a/3.0.5a/1_Template/sources/gfx/test_jpg.h b/1_Demo/sources/gfx/test_jpg.h
similarity index 100%
rename from 3.0.5a/1_Template/sources/gfx/test_jpg.h
rename to 1_Demo/sources/gfx/test_jpg.h
diff --git a/3.0.5a/1_Template/sources/gfx/test_jpg.jpg b/1_Demo/sources/gfx/test_jpg.jpg
similarity index 100%
rename from 3.0.5a/1_Template/sources/gfx/test_jpg.jpg
rename to 1_Demo/sources/gfx/test_jpg.jpg
diff --git a/3.0.5a/1_Template/sources/main.c b/1_Demo/sources/main.c
similarity index 96%
rename from 3.0.5a/1_Template/sources/main.c
rename to 1_Demo/sources/main.c
index f7d5dba..50547c7 100644
--- a/3.0.5a/1_Template/sources/main.c
+++ b/1_Demo/sources/main.c
@@ -105,13 +105,13 @@ int main() {
         {
             case 1:   // Draw images
                 GRRLIB_Printf(5, 25, tex_BMfont2, GRRLIB_WHITE, 1, "IMAGES DEMO");
-         
+
                 GRRLIB_BMFX_Scatter(tex_test_jpg, tex_new, 8);
                 GRRLIB_FlushTex(tex_new);
 
                 GRRLIB_DrawImg(10, 50, tex_test_jpg, 0, 1, 1, GRRLIB_WHITE);
                 GRRLIB_DrawImg(310, 50, tex_new, 0, 1, 1, GRRLIB_WHITE);
-                
+
                 // Draw a sprite
                 GRRLIB_DrawTile(600, 400, tex_sprite_png, 0, 2, 2, GRRLIB_WHITE, 12*4); // Rupee
                 GRRLIB_DrawTile(320+left, 240+top, tex_sprite_png, 0, 2, 2, GRRLIB_WHITE, frame);
diff --git a/3.0.5a/GRRLIB/GRRLIB/GRRLIB.c b/GRRLIB/GRRLIB/GRRLIB.c
similarity index 98%
rename from 3.0.5a/GRRLIB/GRRLIB/GRRLIB.c
rename to GRRLIB/GRRLIB/GRRLIB.c
index 3a18895..a81e5ef 100644
--- a/3.0.5a/GRRLIB/GRRLIB/GRRLIB.c
+++ b/GRRLIB/GRRLIB/GRRLIB.c
@@ -30,8 +30,8 @@ inline void GRRLIB_FillScreen(u32 color) {
 
 /**
  * Draw a dot.
- * @param x specifies the x-coordinate of the dot. 
- * @param y specifies the y-coordinate of the dot. 
+ * @param x specifies the x-coordinate of the dot.
+ * @param y specifies the y-coordinate of the dot.
  * @param color the color of the dot.
  */
 inline void GRRLIB_Plot(f32 x, f32 y, u32 color) {
@@ -536,7 +536,7 @@ void GRRLIB_BMFX_GrayScale(GRRLIB_texImg texsrc, GRRLIB_texImg texdest) {
  * @see GRRLIB_FlushTex
  * @param texsrc the texture source.
  * @param texdest the texture grayscaled destination.
- * @param factor The factor level of the effect. 
+ * @param factor The factor level of the effect.
  */
 void GRRLIB_BMFX_Scatter(GRRLIB_texImg texsrc, GRRLIB_texImg texdest, int factor) {
     unsigned int x, y;
diff --git a/3.0.5a/GRRLIB/GRRLIB/GRRLIB.h b/GRRLIB/GRRLIB/GRRLIB.h
similarity index 100%
rename from 3.0.5a/GRRLIB/GRRLIB/GRRLIB.h
rename to GRRLIB/GRRLIB/GRRLIB.h
diff --git a/3.0.5a/GRRLIB/lib/libjpeg.a b/GRRLIB/lib/libjpeg.a
similarity index 100%
rename from 3.0.5a/GRRLIB/lib/libjpeg.a
rename to GRRLIB/lib/libjpeg.a
diff --git a/3.0.5a/GRRLIB/lib/libjpeg/jconfig.h b/GRRLIB/lib/libjpeg/jconfig.h
similarity index 100%
rename from 3.0.5a/GRRLIB/lib/libjpeg/jconfig.h
rename to GRRLIB/lib/libjpeg/jconfig.h
diff --git a/3.0.5a/GRRLIB/lib/libjpeg/jmorecfg.h b/GRRLIB/lib/libjpeg/jmorecfg.h
similarity index 100%
rename from 3.0.5a/GRRLIB/lib/libjpeg/jmorecfg.h
rename to GRRLIB/lib/libjpeg/jmorecfg.h
diff --git a/3.0.5a/GRRLIB/lib/libjpeg/jpeglib.h b/GRRLIB/lib/libjpeg/jpeglib.h
similarity index 100%
rename from 3.0.5a/GRRLIB/lib/libjpeg/jpeglib.h
rename to GRRLIB/lib/libjpeg/jpeglib.h
diff --git a/3.0.5a/GRRLIB/lib/libjpeg/jpgogc.h b/GRRLIB/lib/libjpeg/jpgogc.h
similarity index 100%
rename from 3.0.5a/GRRLIB/lib/libjpeg/jpgogc.h
rename to GRRLIB/lib/libjpeg/jpgogc.h
diff --git a/3.0.5a/GRRLIB/lib/libpng.a b/GRRLIB/lib/libpng.a
similarity index 100%
rename from 3.0.5a/GRRLIB/lib/libpng.a
rename to GRRLIB/lib/libpng.a
diff --git a/3.0.5a/GRRLIB/lib/libpng/png.h b/GRRLIB/lib/libpng/png.h
similarity index 100%
rename from 3.0.5a/GRRLIB/lib/libpng/png.h
rename to GRRLIB/lib/libpng/png.h
diff --git a/3.0.5a/GRRLIB/lib/libpng/pngconf.h b/GRRLIB/lib/libpng/pngconf.h
similarity index 100%
rename from 3.0.5a/GRRLIB/lib/libpng/pngconf.h
rename to GRRLIB/lib/libpng/pngconf.h
diff --git a/3.0.5a/GRRLIB/lib/libpng/pngu/pngu.c b/GRRLIB/lib/libpng/pngu/pngu.c
similarity index 100%
rename from 3.0.5a/GRRLIB/lib/libpng/pngu/pngu.c
rename to GRRLIB/lib/libpng/pngu/pngu.c
diff --git a/3.0.5a/GRRLIB/lib/libpng/pngu/pngu.h b/GRRLIB/lib/libpng/pngu/pngu.h
similarity index 100%
rename from 3.0.5a/GRRLIB/lib/libpng/pngu/pngu.h
rename to GRRLIB/lib/libpng/pngu/pngu.h