Refactored the template organisation, everything is clearer and isolate now