Better organization of templates scraped from other sites