A little cleanup.
Add destination option to all templates.
Update template content to accommodate destination 
Update package template