added missing template items
added analytics folder
merge