Rearranged templates directory