Moved all templates to individual folder to clean up templating