Small changes by Re#
Started modifying templates

Started making changes as needed to adapt to Standard Tridion
Implementation.