moved and deleted unused templates