End of template reorganization