[GSP] Rename and move templates to the appropriate place