Start reorganzing templates