Added stripping of template folder as an option

- DRYed up the template command