Revert "Initiate template rearrange"

This reverts commit ca819fb672ae15e57050f0d0ed5e0db11249fb29.