Again changes to structure, use new iron-router and handlebar-helpers