Fix folder structure for template bundle