[tor-commits] [dev/master] Fix structure and templates