Modified templates and files toward grizzly release

Replaced templates and files so that they are compatible with grizzly release.