Corrections #1 - Templating

Corrections for a previous pull. Templates directory and dependencies should be correctly inserted.