Move templates to Partials
Javascript restructuring