Made organization changes in templates
Merge pull request #17 from willietran/layout

Made organization changes in templates