reestructure template folder !