Final commit of from template version, Fixed wrong directory (incomplete before)