- added template folder creation
- some adjustments