Moving references to .org and routine updates