Restructure templates directory