Moving templates
Fix paths
Extending error handling