rearrange org-modo, so capture template targets change