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