Reorganize front templates