Embeds removed from templates, deprecated template directories removed. Final testing needed prior to pushing to master branch.