Fixed wrong paths, and symlinked templates
Merged with current version