Reorged templates/views