Some base templates
Fixed file tracking