Put back the templates folder

Note folders with similar names to ignored folders will not be committed
Remove menu items not been used