Updates to org files and org settings