Moved Setup Organize templates to individual partials #562