simplify org capture templates and add org modules