Updating Template Files

Cleaning up template files so that all the XML file info and Index.php
file info matches the new layout.