Moved templates into subdirectory. Issue: #487