Reorganized "Templates" folder