Use correct documents/org path to fix features

Also update template where this was hard coded.