- Removed useless templates - Reviewed all Makefiles - Rework some code for Android support - Added resources to advance template